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 48665d5df8a519c1efcbd85b77f3e9b1fb05006d..0a8a297318db47406e2eebaff78c1aacf56e7c60 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -1349,6 +1349,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. |
@@ -1418,7 +1419,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( |