diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 21:58:18 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 21:58:18 +0000 |
| commit | ecaae0a04cad41f2bc59a2a5671d6f9cdf82de99 (patch) | |
| tree | 37a78aa07506eaf4d3183a3e6bb47ac40bdb95ff /content/browser | |
| parent | 4afc8d67c4d6491fe1e1d60d17fa6651e861e795 (diff) | |
| download | chromium_src-ecaae0a04cad41f2bc59a2a5671d6f9cdf82de99.zip chromium_src-ecaae0a04cad41f2bc59a2a5671d6f9cdf82de99.tar.gz chromium_src-ecaae0a04cad41f2bc59a2a5671d6f9cdf82de99.tar.bz2 | |
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
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/histogram_message_filter.cc | 12 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/content/browser/histogram_message_filter.cc b/content/browser/histogram_message_filter.cc index be6f85fc..ac08af3 100644 --- a/content/browser/histogram_message_filter.cc +++ b/content/browser/histogram_message_filter.cc @@ -49,17 +49,17 @@ void HistogramMessageFilter::OnGetBrowserHistogram( DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); // Security: Only allow access to browser histograms when running in the // context of a test. - bool using_stats_collection_controller = + bool using_dom_controller = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kStatsCollectionController); + switches::kDomAutomationController); bool reduced_security = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kReduceSecurityForStatsCollectionTests); + switches::kReduceSecurityForDomAutomationTests); - if (!using_stats_collection_controller || !reduced_security) { + if (!using_dom_controller || !reduced_security) { LOG(ERROR) << "Attempt at reading browser histogram without specifying " - << "--" << switches::kStatsCollectionController << " and " - << "--" << switches::kReduceSecurityForStatsCollectionTests + << "--" << switches::kDomAutomationController << " and " + << "--" << switches::kReduceSecurityForDomAutomationTests << " switches."; return; } diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 096698c..e864f81 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -942,7 +942,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kRendererStartupDialog, switches::kShowPaintRects, switches::kSitePerProcess, - switches::kStatsCollectionController, switches::kTestSandbox, switches::kTouchEvents, switches::kTraceStartup, |