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

tools/perf/benchmarks/kraken.py

 # Copyright 2012 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.
 
 """Runs Mozilla's Kraken JavaScript benchmark."""
 
 import os
 
 from metrics import power
 from telemetry import benchmark
@@ skipping 55 matching lines @@
 
 
 class _KrakenMeasurement(page_test.PageTest):
   def __init__(self):
     super(_KrakenMeasurement, 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(
         'document.title.indexOf("Results") != -1', 700)
     tab.WaitForDocumentReadyStateToBeComplete()
 
     self._power_metric.Stop(page, tab)
@@ skipping 26 matching lines @@
   """Mozilla's Kraken JavaScript benchmark."""
   test = _KrakenMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       archive_data_file='../page_sets/data/kraken.json',
       file_path=os.path.abspath(__file__))
     ps.AddPageWithDefaultRunNavigate(
       'http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html')
     return ps