Embedded Extension Options: remove flags and trunk channel restrictions

chrome/browser/extensions/extension_webui_apitest.cc

Index: chrome/browser/extensions/extension_webui_apitest.cc
diff --git a/chrome/browser/extensions/extension_webui_apitest.cc b/chrome/browser/extensions/extension_webui_apitest.cc
index d3f777788a3da611dc7c416e067d95a0c43fe447..bdc525bf65a665be8d589b15bfac73a48b38fcd1 100644
--- a/chrome/browser/extensions/extension_webui_apitest.cc
+++ b/chrome/browser/extensions/extension_webui_apitest.cc
@@ -127,16 +127,6 @@ class ExtensionWebUITest : public ExtensionApiTest {
     return frame_host;
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    FeatureSwitch::ScopedOverride enable_options(
-        FeatureSwitch::embedded_extension_options(), true);
-    // Need to add a command line flag as well as a FeatureSwitch because the
-    // FeatureSwitch is not copied over to the renderer process from the
-    // browser process.
-    command_line->AppendSwitch(switches::kEnableEmbeddedExtensionOptions);
-    ExtensionApiTest::SetUpCommandLine(command_line);
-  }
-
   scoped_ptr<FeatureSwitch::ScopedOverride> enable_options_;
 };