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

chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.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 "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
 
 #include "base/command_line.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 267 matching lines @@
     }
   }
 
   if (extensions::FeatureSwitch::app_view()->IsEnabled() &&
       context->GetAvailability("appViewEmbedderInternal").is_available()) {
     module_system->Require("appView");
   } else if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT) {
     module_system->Require("denyAppView");
   }
 
-  if (context->GetAvailability("extensionOptionsInternal").is_available()) {
+  if (extensions::FeatureSwitch::embedded_extension_options()->IsEnabled() &&
+      context->GetAvailability("extensionOptionsInternal").is_available()) {
     module_system->Require("extensionOptions");
   }
 }
 
 void ChromeExtensionsDispatcherDelegate::OnActiveExtensionsUpdated(
     const std::set<std::string>& extension_ids) {
   // In single-process mode, the browser process reports the active extensions.
   if (CommandLine::ForCurrentProcess()->HasSwitch(::switches::kSingleProcess))
     return;
   crash_keys::SetActiveExtensions(extension_ids);
@@ skipping 44 matching lines @@
       new extensions::PermissionSet(extensions::APIPermissionSet(),
                                     extensions::ManifestPermissionSet(),
                                     origin_set,
                                     extensions::URLPatternSet()));
 }
 
 void ChromeExtensionsDispatcherDelegate::HandleWebRequestAPIUsage(
     bool webrequest_used) {
   webrequest_used_ = webrequest_used;
 }