Revert 202620 "Collect tab timing information for use in telemen..."

> Collect tab timing information for use in telementry-based startup tests
> 
> Motivation: Data collection exposed in this CL is needed by upcoming startup tests we're writing using Telemtry.
> 
> Expose a new window.statsCollectionController object to JS and move existing histogram reading code into it since that seemed misplaced in DOMAutomationController.
> 
> Add a new --enable-stats-collection-bindings to activate said object.
> 
> Example usage in telemtry:
> with browser.Create() as b:
>   b.tabs[0].Navigate("http://www.google.com")
>   b.tabs[0].WaitForDocumentReadyStateToBeComplete()
>   print b.tabs[0].EvaluateJavaScript('statsCollectionController.tabLoadTiming()')
> 
> BUG=None
> 
> Review URL: https://chromiumcodereview.appspot.com/12389073

TBR=jeremy@chromium.org

Review URL: https://codereview.chromium.org/16160006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202662 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 10 deletions

diff --git a/tools/perf/perf_tools/histogram_metric.py b/tools/perf/perf_tools/histogram_metric.py
index 10b9a27..d05394e 100644
--- a/tools/perf/perf_tools/histogram_metric.py
+++ b/tools/perf/perf_tools/histogram_metric.py
@@ -36,7 +36,7 @@ class HistogramMetric(object):
     return 'getHistogram'
 
   def _GetHistogramFromDomAutomation(self, tab):
-    js = ('window.statsCollectionController.%s ? '
-          'window.statsCollectionController.%s("%s") : ""' %
+    js = ('window.domAutomationController.%s ? '
+          'window.domAutomationController.%s("%s") : ""' %
           (self.histogram_function, self.histogram_function, self.name))
     return tab.EvaluateJavaScript(js)
diff --git a/tools/perf/perf_tools/memory_measurement.py b/tools/perf/perf_tools/memory_measurement.py
index 476f746..37e14a2 100644
--- a/tools/perf/perf_tools/memory_measurement.py
+++ b/tools/perf/perf_tools/memory_measurement.py
@@ -29,7 +29,7 @@ class MemoryMeasurement(page_measurement.PageMeasurement):
       h.Start(page, tab)
 
   def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArg('--enable-stats-collection-bindings')
+    options.AppendExtraBrowserArg('--dom-automation')
     # For a hard-coded set of Google pages (such as GMail), we produce custom
     # memory histograms (V8.Something_gmail) instead of the generic histograms
     # (V8.Something), if we detect that a renderer is only rendering this page
@@ -38,8 +38,7 @@ class MemoryMeasurement(page_measurement.PageMeasurement):
     # pages.
     options.AppendExtraBrowserArg('--disable-histogram-customizer')
     options.AppendExtraBrowserArg('--memory-metrics')
-    options.AppendExtraBrowserArg(
-        '--reduce-security-for-stats-collection-tests')
+    options.AppendExtraBrowserArg('--reduce-security-for-dom-automation-tests')
 
   def CanRunForPage(self, page):
     return hasattr(page, 'stress_memory')
diff --git a/tools/perf/perf_tools/page_cycler.py b/tools/perf/perf_tools/page_cycler.py
index e629000..6c5d1da 100644
--- a/tools/perf/perf_tools/page_cycler.py
+++ b/tools/perf/perf_tools/page_cycler.py
@@ -62,7 +62,7 @@ class PageCycler(page_measurement.PageMeasurement):
       h.Start(page, tab)
 
   def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArg('--enable-stats-collection-bindings')
+    options.AppendExtraBrowserArg('--dom-automation')
     options.AppendExtraBrowserArg('--js-flags=--expose_gc')
     options.AppendExtraBrowserArg('--no-sandbox')
 
diff --git a/tools/perf/perf_tools/startup_measurement.py b/tools/perf/perf_tools/startup_measurement.py
index a182ebe..0c4284f 100644
--- a/tools/perf/perf_tools/startup_measurement.py
+++ b/tools/perf/perf_tools/startup_measurement.py
@@ -19,12 +19,11 @@ class PerfWarm(page_measurement.PageMeasurement):
                                    discard_first_result=True)
 
   def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArg('--enable-stats-collection-bindings')
-    options.AppendExtraBrowserArg(
-          '--reduce-security-for-stats-collection-tests')
+    options.AppendExtraBrowserArg('--dom-automation')
+    options.AppendExtraBrowserArg('--reduce-security-for-dom-automation-tests')
 
   def MeasurePage(self, page, tab, results):
-    get_histogram_js = "statsCollectionController.getBrowserHistogram(\"%s\")"
+    get_histogram_js = "domAutomationController.getBrowserHistogram(\"%s\")"
 
     for display_name, histogram_name in self.HISTOGRAMS_TO_RECORD.iteritems():
       result = tab.EvaluateJavaScript(get_histogram_js % histogram_name)