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

extensions/browser/guest_view/extension_options/extension_options_guest.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 "extensions/browser/guest_view/extension_options/extension_options_guest.h"
 
 #include "base/values.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_instance.h"
@@ skipping 32 matching lines @@
               ->CreateExtensionOptionsGuestDelegate(this)) {
 }
 
 ExtensionOptionsGuest::~ExtensionOptionsGuest() {
 }
 
 // static
 extensions::GuestViewBase* ExtensionOptionsGuest::Create(
     content::BrowserContext* browser_context,
     int guest_instance_id) {
+  if (!extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()) {
+    return NULL;
+  }
   return new ExtensionOptionsGuest(browser_context, guest_instance_id);
 }
 
 void ExtensionOptionsGuest::CreateWebContents(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,
     const base::DictionaryValue& create_params,
     const WebContentsCreatedCallback& callback) {
   // Get the extension's base URL.
   std::string extension_id;
@@ skipping 185 matching lines @@
   attach_params()->GetInteger(extensionoptions::kAttributeMinWidth, &min_width);
 
   // Call SetAutoSize to apply all the appropriate validation and clipping of
   // values.
   SetAutoSize(auto_size_enabled,
               gfx::Size(min_width, min_height),
               gfx::Size(max_width, max_height));
 }
 
 }  // namespace extensions