| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index a8e866010eec06dfa0690ae2391ff42f0dc42b20..d46acd2fc7f7a2128a05ebe71fff1b8eb30c95a2 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -32,6 +32,7 @@
|
| #include "base/path_service.h"
|
| #include "base/process/launch.h"
|
| #include "base/process/memory.h"
|
| +#include "base/process/process.h"
|
| #include "base/process/process_handle.h"
|
| #include "base/profiler/scoped_tracker.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -142,12 +143,8 @@ void InitializeFieldTrialAndFeatureList(
|
|
|
| // Ensure any field trials in browser are reflected into the child
|
| // process.
|
| - if (command_line.HasSwitch(switches::kForceFieldTrials)) {
|
| - bool result = base::FieldTrialList::CreateTrialsFromString(
|
| - command_line.GetSwitchValueASCII(switches::kForceFieldTrials),
|
| - std::set<std::string>());
|
| - DCHECK(result);
|
| - }
|
| + base::FieldTrialList::CreateTrialsFromCommandLine(
|
| + command_line, switches::kFieldTrialHandle);
|
|
|
| std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| feature_list->InitializeFromCommandLine(
|
|
|