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

chrome/browser/extensions/extension_webui_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/files/file_util.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 109 matching lines @@
 
     if (active_web_contents->GetLastCommittedURL() == frame_url)
       return active_web_contents->GetMainFrame();
 
     content::RenderFrameHost* frame_host = NULL;
     active_web_contents->ForEachFrame(
         base::Bind(&FindFrame, frame_url, &frame_host));
     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_;
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebUITest, SanityCheckAvailableAPIsInFrame) {
   ASSERT_TRUE(RunTestOnExtensionsFrame("sanity_check_available_apis.js"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebUITest,
                        SanityCheckAvailableAPIsInChromeFrame) {
   ASSERT_TRUE(RunTestOnChromeExtensionsFrame("sanity_check_available_apis.js"));
@@ skipping 87 matching lines @@
 
   ASSERT_TRUE(listener->WaitUntilSatisfied());
   listener->Reply(extension->id());
   listener.reset(new ExtensionTestMessageListener("onclose received", false));
   ASSERT_TRUE(listener->WaitUntilSatisfied());
 }
 
 }  // namespace
 
 }  // namespace extensions