Revert of Change PageTest.WillStartBrowser to depend on platform instead of browser object as it would not ha…

tools/perf/measurements/media.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from metrics import cpu
 from metrics import media
 from metrics import system_memory
 from metrics import power
 from telemetry.page import page_test
 
 
 class Media(page_test.PageTest):
   """The MediaMeasurement class gathers media-related metrics on a page set.
 
   Media metrics recorded are controlled by metrics/media.js.  At the end of the
   test each metric for every media element in the page are reported.
   """
 
   def __init__(self):
     super(Media, self).__init__('RunMediaMetrics')
     self._media_metric = None
     # Used to add browser power and CPU metrics to results per test.
     self._add_browser_metrics = False
     self._cpu_metric = None
     self._memory_metric = None
     self._power_metric = None
 
-  def WillStartBrowser(self, platform):
-    self._power_metric = power.PowerMetric(platform)
+  def WillStartBrowser(self, browser):
+    self._power_metric = power.PowerMetric(browser)
 
   def CustomizeBrowserOptions(self, options):
     # Needed to run media actions in JS on touch-based devices as on Android.
     options.AppendExtraBrowserArgs(
         '--disable-gesture-requirement-for-media-playback')
     power.PowerMetric.CustomizeBrowserOptions(options)
 
   def DidNavigateToPage(self, page, tab):
     """Override to do operations right after the page is navigated."""
     self._media_metric = media.MediaMetric(tab)
@@ skipping 19 matching lines @@
       self._cpu_metric.Stop(page, tab)
       self._memory_metric.Stop(page, tab)
       self._power_metric.Stop(page, tab)
       self._cpu_metric.AddResults(tab, results, trace_name=trace_name)
       exclude_metrics = ['WorkingSetSizePeak', 'SystemCommitCharge', 'VMPeak',
                          'VM']
       self._memory_metric.AddResults(tab, results,
                                      trace_name=trace_name,
                                      exclude_metrics=exclude_metrics)
       self._power_metric.AddResults(tab, results)