| 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 7592d3f8f96b0942eb8fdfded0035bcf1d54c70b..5b1c6164cc369101a01595f6923851e6f4829c81 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -446,24 +446,6 @@ std::string UintVectorToString(const std::vector<unsigned>& vector) {
|
| return str;
|
| }
|
|
|
| -// Copies kEnableFeatures and kDisableFeatures to the renderer command line.
|
| -// Generates them from the FeatureList override state, to take into account
|
| -// overrides from FieldTrials.
|
| -void CopyEnableDisableFeatureFlagsToRenderer(base::CommandLine* renderer_cmd) {
|
| - std::string enabled_features;
|
| - std::string disabled_features;
|
| - base::FeatureList::GetInstance()->GetFeatureOverrides(&enabled_features,
|
| - &disabled_features);
|
| - if (!enabled_features.empty()) {
|
| - renderer_cmd->AppendSwitchASCII(switches::kEnableFeatures,
|
| - enabled_features);
|
| - }
|
| - if (!disabled_features.empty()) {
|
| - renderer_cmd->AppendSwitchASCII(switches::kDisableFeatures,
|
| - disabled_features);
|
| - }
|
| -}
|
| -
|
| } // namespace
|
|
|
| RendererMainThreadFactoryFunction g_renderer_main_thread_factory = NULL;
|
| @@ -1558,7 +1540,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
| renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
|
| arraysize(kSwitchNames));
|
|
|
| - CopyEnableDisableFeatureFlagsToRenderer(renderer_cmd);
|
| + ChildProcessHostImpl::CopyEnableDisableFeatureFlags(renderer_cmd);
|
|
|
| if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
|
| BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) {
|
|
|