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 fccb830e7cbbfdfbbc527e3bbb9ae73fa09a6ae0..71ecf15c6bdb0935ff0066b6c46e537206b66792 100644 |
--- a/content/ppapi_plugin/ppapi_plugin_main.cc |
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc |
@@ -6,6 +6,7 @@ |
#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" |
@@ -131,6 +132,12 @@ int PpapiPluginMain(const MainFunctionParams& parameters) { |
LinuxSandbox::InitializeSandbox(); |
#endif |
+ scoped_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. |