[Media Router] Update Media Router flags post-launch.

extensions/common/feature_switch.cc

 // Copyright 2013 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/common/feature_switch.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "extensions/common/switches.h"
 
 namespace extensions {
 
 namespace {
 
-// The switch media-router is defined in chrome/common/chrome_switches.cc, but
-// we can't depend on chrome here.
-const char kMediaRouterFlag[] = "media-router";
+// The switch load-media-router-component-extension is defined in
+// chrome/common/chrome_switches.cc, but we can't depend on chrome here.
+const char kLoadMediaRouterComponentExtensionFlag[] =
+    "load-media-router-component-extension";
 
-const char kEnableMediaRouterExperiment[] = "EnableMediaRouter";
 const char kExtensionActionRedesignExperiment[] = "ExtensionActionRedesign";
 
 class CommonSwitches {
  public:
   CommonSwitches()
       : easy_off_store_install(nullptr, FeatureSwitch::DEFAULT_DISABLED),
         force_dev_mode_highlighting(switches::kForceDevModeHighlighting,
                                     FeatureSwitch::DEFAULT_DISABLED),
         prompt_for_external_extensions(
 #if defined(CHROMIUM_BUILD)
@@ skipping 11 matching lines @@
                                      FeatureSwitch::DEFAULT_DISABLED),
         extension_action_redesign(switches::kExtensionActionRedesign,
                                   kExtensionActionRedesignExperiment,
                                   FeatureSwitch::DEFAULT_ENABLED),
         scripts_require_action(switches::kScriptsRequireAction,
                                FeatureSwitch::DEFAULT_DISABLED),
         embedded_extension_options(switches::kEmbeddedExtensionOptions,
                                    FeatureSwitch::DEFAULT_DISABLED),
         trace_app_source(switches::kTraceAppSource,
                          FeatureSwitch::DEFAULT_ENABLED),
-        media_router(kMediaRouterFlag,
-                     kEnableMediaRouterExperiment,
-                     FeatureSwitch::DEFAULT_ENABLED) {
+        load_media_router_component_extension(
+            kLoadMediaRouterComponentExtensionFlag,

[Devlin, 2016/10/25 20:38:02]

Do we want chrome users to be able to disable this functionality?

+#if defined(GOOGLE_CHROME_BUILD)
+            FeatureSwitch::DEFAULT_ENABLED)
+#else
+            FeatureSwitch::DEFAULT_DISABLED)
+#endif  // defined(GOOGLE_CHROME_BUILD)
+  {
   }
 
   // Enables extensions to be easily installed from sites other than the web
   // store.
   FeatureSwitch easy_off_store_install;
 
   FeatureSwitch force_dev_mode_highlighting;
 
   // Should we prompt the user before allowing external extensions to install?
   // Default is yes.
   FeatureSwitch prompt_for_external_extensions;
 
   FeatureSwitch error_console;
   FeatureSwitch enable_override_bookmarks_ui;
   FeatureSwitch extension_action_redesign;
   FeatureSwitch scripts_require_action;
   FeatureSwitch embedded_extension_options;
   FeatureSwitch trace_app_source;
-  FeatureSwitch media_router;
+  FeatureSwitch load_media_router_component_extension;
 };
 
 base::LazyInstance<CommonSwitches> g_common_switches =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 FeatureSwitch* FeatureSwitch::force_dev_mode_highlighting() {
   return &g_common_switches.Get().force_dev_mode_highlighting;
 }
@@ skipping 14 matching lines @@
 }
 FeatureSwitch* FeatureSwitch::scripts_require_action() {
   return &g_common_switches.Get().scripts_require_action;
 }
 FeatureSwitch* FeatureSwitch::embedded_extension_options() {
   return &g_common_switches.Get().embedded_extension_options;
 }
 FeatureSwitch* FeatureSwitch::trace_app_source() {
   return &g_common_switches.Get().trace_app_source;
 }
-FeatureSwitch* FeatureSwitch::media_router() {
-  return &g_common_switches.Get().media_router;
+FeatureSwitch* FeatureSwitch::load_media_router_component_extension() {
+  return &g_common_switches.Get().load_media_router_component_extension;
 }
 
 FeatureSwitch::ScopedOverride::ScopedOverride(FeatureSwitch* feature,
                                               bool override_value)
     : feature_(feature),
       previous_value_(feature->GetOverrideValue()) {
   feature_->SetOverrideValue(
       override_value ? OVERRIDE_ENABLED : OVERRIDE_DISABLED);
 }
 
@@ skipping 80 matching lines @@
 
 void FeatureSwitch::SetOverrideValue(OverrideValue override_value) {
   override_value_ = override_value;
 }
 
 FeatureSwitch::OverrideValue FeatureSwitch::GetOverrideValue() const {
   return override_value_;
 }
 
 }  // namespace extensions