| Index: content/ppapi_plugin/ppapi_plugin_main.cc
|
| diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
|
| index 2eec3e2b2c169aeeea24b61bbf36bc397ba8d2f9..3c687333eabf70829ae1e48aadd9e5ad5f333614 100644
|
| --- a/content/ppapi_plugin/ppapi_plugin_main.cc
|
| +++ b/content/ppapi_plugin/ppapi_plugin_main.cc
|
| @@ -6,7 +6,6 @@
|
| #include "base/command_line.h"
|
| #include "base/debug/crash_logging.h"
|
| #include "base/debug/debugger.h"
|
| -#include "base/feature_list.h"
|
| #include "base/files/file_path.h"
|
| #include "base/i18n/rtl.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -123,12 +122,6 @@ int PpapiPluginMain(const MainFunctionParams& parameters) {
|
| LinuxSandbox::InitializeSandbox();
|
| #endif
|
|
|
| - std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| - feature_list->InitializeFromCommandLine(
|
| - command_line.GetSwitchValueASCII(switches::kEnableFeatures),
|
| - command_line.GetSwitchValueASCII(switches::kDisableFeatures));
|
| - base::FeatureList::SetInstance(std::move(feature_list));
|
| -
|
| ChildProcess ppapi_process;
|
| ppapi_process.set_main_thread(
|
| new PpapiThread(parameters.command_line, false)); // Not a broker.
|
|
|