Enable --enable-mime-handler-view by default

This enables --enable-mime-handler-view and removes the flag. Note that extensions that can use this
are still whitelisted in chrome's _manifest_features.json.

BUG=304966

Review URL: https://codereview.chromium.org/758493003

Cr-Commit-Position: refs/heads/master@{#305597}

5 files changed, 0 insertions, 20 deletions

diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index 033f9b2..3b8340b 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -14,7 +14,6 @@
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension_messages.h"
-#include "extensions/common/feature_switch.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "ipc/ipc_message_macros.h"
@@ -31,9 +30,6 @@ const char MimeHandlerViewGuest::Type[] = "mimehandler";
 GuestViewBase* MimeHandlerViewGuest::Create(
     content::BrowserContext* browser_context,
     int guest_instance_id) {
-  if (!extensions::FeatureSwitch::mime_handler_view()->IsEnabled())
-    return NULL;
-
   return new MimeHandlerViewGuest(browser_context, guest_instance_id);
 }
 
diff --git a/extensions/common/feature_switch.cc b/extensions/common/feature_switch.cc
index 65e1456..b836aad 100644
--- a/extensions/common/feature_switch.cc
+++ b/extensions/common/feature_switch.cc
@@ -35,8 +35,6 @@ class CommonSwitches {
                                FeatureSwitch::DEFAULT_DISABLED),
         embedded_extension_options(switches::kEmbeddedExtensionOptions,
                                    FeatureSwitch::DEFAULT_DISABLED),
-        mime_handler_view(switches::kMimeHandlerView,
-                          FeatureSwitch::DEFAULT_DISABLED),
         trace_app_source(switches::kTraceAppSource,
                          FeatureSwitch::DEFAULT_DISABLED) {
   }
@@ -56,7 +54,6 @@ class CommonSwitches {
   FeatureSwitch extension_action_redesign;
   FeatureSwitch scripts_require_action;
   FeatureSwitch embedded_extension_options;
-  FeatureSwitch mime_handler_view;
   FeatureSwitch trace_app_source;
 };
 
@@ -89,9 +86,6 @@ FeatureSwitch* FeatureSwitch::scripts_require_action() {
 FeatureSwitch* FeatureSwitch::embedded_extension_options() {
   return &g_common_switches.Get().embedded_extension_options;
 }
-FeatureSwitch* FeatureSwitch::mime_handler_view() {
-  return &g_common_switches.Get().mime_handler_view;
-}
 FeatureSwitch* FeatureSwitch::trace_app_source() {
   return &g_common_switches.Get().trace_app_source;
 }
diff --git a/extensions/common/feature_switch.h b/extensions/common/feature_switch.h
index a6a9af3..f54d2d4 100644
--- a/extensions/common/feature_switch.h
+++ b/extensions/common/feature_switch.h
@@ -27,7 +27,6 @@ class FeatureSwitch {
   static FeatureSwitch* extension_action_redesign();
   static FeatureSwitch* scripts_require_action();
   static FeatureSwitch* embedded_extension_options();
-  static FeatureSwitch* mime_handler_view();
   static FeatureSwitch* trace_app_source();
 
   enum DefaultValue {
diff --git a/extensions/common/switches.cc b/extensions/common/switches.cc
index 144c135..81f9033 100644
--- a/extensions/common/switches.cc
+++ b/extensions/common/switches.cc
@@ -46,10 +46,6 @@ const char kEnableExperimentalExtensionApis[] =
 const char kEnableExtensionActionRedesign[] =
     "enable-extension-action-redesign";
 
-// Hack so that feature switch can work with about_flags. See
-// kEnableScriptsRequireAction.
-const char kEnableMimeHandlerView[] = "enable-mime-handler-view";
-
 // Enables the mojo implementation of the serial API.
 const char kEnableMojoSerialService[] = "enable-mojo-serial-service";
 
@@ -82,9 +78,6 @@ const char kForceDevModeHighlighting[] = "force-dev-mode-highlighting";
 // the list will be launched.
 const char kLoadApps[] = "load-apps";
 
-// Whether or not mime handler view guests are enabled.
-const char kMimeHandlerView[] = "mime-handler-view";
-
 // Notify the user and require consent for extensions running scripts.
 // Appending --scripts-require-action=1 has the same effect as
 // --enable-scripts-require-action (see below).
diff --git a/extensions/common/switches.h b/extensions/common/switches.h
index 127bd3d..501f8c6 100644
--- a/extensions/common/switches.h
+++ b/extensions/common/switches.h
@@ -20,7 +20,6 @@ extern const char kEnableAppWindowControls[];
 extern const char kEnableEmbeddedExtensionOptions[];
 extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionActionRedesign[];
-extern const char kEnableMimeHandlerView[];
 extern const char kEnableMojoSerialService[];
 extern const char kEnableOverrideBookmarksUI[];
 extern const char kEnableRemoteAssistance[];
@@ -30,7 +29,6 @@ extern const char kExtensionProcess[];
 extern const char kExtensionsOnChromeURLs[];
 extern const char kForceDevModeHighlighting[];
 extern const char kLoadApps[];
-extern const char kMimeHandlerView[];
 extern const char kScriptsRequireAction[];
 extern const char kEnableScriptsRequireAction[];
 extern const char kShowComponentExtensionOptions[];