Revert "Embedded Extension Options: remove flags and trunk channel restrictions"

extensions/browser/guest_view/extension_options/extension_options_apitest.cc

Index: extensions/browser/guest_view/extension_options/extension_options_apitest.cc
diff --git a/extensions/browser/guest_view/extension_options/extension_options_apitest.cc b/extensions/browser/guest_view/extension_options/extension_options_apitest.cc
index bdd1cdc23243f4954f318e03900447c62f3bfa75..af98ead1b454a358d2dbb17f1aeb99ecbc2bbc19 100644
--- a/extensions/browser/guest_view/extension_options/extension_options_apitest.cc
+++ b/extensions/browser/guest_view/extension_options/extension_options_apitest.cc
@@ -14,6 +14,20 @@ using extensions::Extension;
 using extensions::FeatureSwitch;
 
 class ExtensionOptionsApiTest : public ExtensionApiTest {
+ private:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+
+    enable_options_.reset(new FeatureSwitch::ScopedOverride(
+        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(
+        extensions::switches::kEnableEmbeddedExtensionOptions);
+  }
+
+  scoped_ptr<FeatureSwitch::ScopedOverride> enable_options_;
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionOptionsApiTest, ExtensionCanEmbedOwnOptions) {