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

extensions/browser/guest_view/extension_options/extension_options_apitest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/result_catcher.h"
 
 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) {
   base::FilePath extension_dir =
       test_data_dir_.AppendASCII("extension_options").AppendASCII("embed_self");
   ASSERT_TRUE(LoadExtension(extension_dir));
   ASSERT_TRUE(RunExtensionSubtest("extension_options/embed_self", "test.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionOptionsApiTest,
@@ skipping 23 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionOptionsApiTest,
                        CannotEmbedUsingInvalidExtensionIds) {
   ASSERT_TRUE(InstallExtension(test_data_dir_.AppendASCII("extension_options")
                                    .AppendASCII("embed_invalid"),
                                1));
   ASSERT_TRUE(
       RunExtensionSubtest("extension_options/embed_invalid", "test.html"));
 }