rebase

mozilla-central/patches/TOP-PLASTER-revert-poll-interval.patch

@@ -6,10 +6,10 @@ Bug 9999999 - Revert to old poll_interval for developer builds.
 diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
 --- a/python/mozbuild/mozbuild/controller/building.py
 +++ b/python/mozbuild/mozbuild/controller/building.py
-@@ -178,20 +178,26 @@ class BuildMonitor(MozbuildObject):
+@@ -188,20 +188,26 @@ class BuildMonitor(MozbuildObject):
      """Monitors the output of the build."""
  
-     def init(self, warnings_path, terminal):
+     def init(self, warnings_path, terminal, metrics):
          """Create a new monitor.
  
          warnings_path is a path of a warnings database to use.
@@ -31,7 +31,7 @@ diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/m
 +            )
          self._resources_started = False
  
-         self.tiers = TierStatus(self.resources)
+         self.tiers = TierStatus(self.resources, metrics)
  
          self.warnings_database = WarningsDatabase()
          if os.path.exists(warnings_path):