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

tools/perf/benchmarks/sunspider.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.
 import collections
 import json
 import os
 
 from metrics import power
 from telemetry import benchmark
 from telemetry.page import page_set
@@ skipping 62 matching lines @@
 
 
 class _SunspiderMeasurement(page_test.PageTest):
   def __init__(self):
     super(_SunspiderMeasurement, self).__init__()
     self._power_metric = None
 
   def CustomizeBrowserOptions(self, options):
     power.PowerMetric.CustomizeBrowserOptions(options)
 
-  def WillStartBrowser(self, platform):
-    self._power_metric = power.PowerMetric(platform)
+  def WillStartBrowser(self, browser):
+    self._power_metric = power.PowerMetric(browser)
 
   def DidNavigateToPage(self, page, tab):
     self._power_metric.Start(page, tab)
 
   def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForJavaScriptExpression(
         'window.location.pathname.indexOf("results.html") >= 0'
         '&& typeof(output) != "undefined"', 300)
 
     self._power_metric.Stop(page, tab)
@@ skipping 32 matching lines @@
   """Apple's SunSpider JavaScript benchmark."""
   test = _SunspiderMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       archive_data_file='../page_sets/data/sunspider.json',
       make_javascript_deterministic=False,
       file_path=os.path.abspath(__file__))
     ps.AddPageWithDefaultRunNavigate(_URL)
     return ps