Index: content/browser/renderer_host/render_process_host_impl.cc |
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
index bd83892fbfe61f01926a02d90d7b366c08d3b486..24ed4b9109dbb001ea2e671cf69a5c98c037b98b 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -1355,6 +1355,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
switches::kTestType, |
switches::kTouchEvents, |
switches::kTouchTextSelectionStrategy, |
+ switches::kTraceConfigFile, |
switches::kTraceToConsole, |
// This flag needs to be propagated to the renderer process for |
// --in-process-webgl. |
@@ -1425,7 +1426,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
arraysize(kSwitchNames)); |
if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
- BrowserMainLoop::GetInstance()->is_tracing_startup()) { |
+ BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { |
// Pass kTraceStartup switch to renderer only if startup tracing has not |
// finished. |
renderer_cmd->AppendSwitchASCII( |