diff options
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, |