Remove deprecated CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP content setting

This content setting was used for a "Don't ask again" button on the Metro mode infobar, but it appears that got removed at the behest of UI review (https://codereview.chromium.org/23591005) a while ago, so we can remove the setting completely.

BUG=512683

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

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

6 files changed, 3 insertions, 37 deletions

diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
index 0287793..6032a0d1 100644
--- a/chrome/browser/plugins/plugin_observer.cc
+++ b/chrome/browser/plugins/plugin_observer.cc
@@ -418,19 +418,6 @@ void PluginObserver::OnNPAPINotSupported(const std::string& identifier) {
   DCHECK(base::win::IsMetroProcess());
 #endif
 
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-  if (profile->IsOffTheRecord())
-    return;
-  HostContentSettingsMap* content_settings =
-      profile->GetHostContentSettingsMap();
-  if (content_settings->GetContentSetting(
-      web_contents()->GetURL(),
-      web_contents()->GetURL(),
-      CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
-      std::string()) == CONTENT_SETTING_BLOCK)
-    return;
-
   scoped_ptr<PluginMetadata> plugin;
   bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier(
       identifier, NULL, &plugin);
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index fa917a2..280295c 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -767,10 +767,6 @@ void ContentSettingsHandler::UpdateExceptionsViewFromModel(
       // supposed to be set by flags and field trials only, thus there is no
       // user facing UI for this content type and we skip it here.
       break;
-#if defined(OS_WIN)
-    case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
-      break;
-#endif
     case CONTENT_SETTINGS_TYPE_APP_BANNER:
       // The content settings type CONTENT_SETTINGS_TYPE_APP_BANNER is used to
       // track whether app banners should be shown or not, and is not a user
@@ -798,9 +794,6 @@ void ContentSettingsHandler::UpdateOTRExceptionsViewFromModel(
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
     case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
     case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
-#if defined(OS_WIN)
-    case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
-#endif
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc
index a171f48..7206a1f 100644
--- a/components/content_settings/core/browser/content_settings_policy_provider.cc
+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc
@@ -41,9 +41,7 @@ const char* kPrefToManageType[] = {
   nullptr,  // No policy for default value of MIDI system exclusive requests
   nullptr,  // No policy for default value of push messaging requests
   nullptr,  // No policy for default value of SSL certificate decisions
-#if defined(OS_WIN)
-  nullptr,  // No policy for default value of "switch to desktop"
-#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
   nullptr,  // No policy for default value of protected media identifier
 #endif
   nullptr,  // No policy for default value of app banners
diff --git a/components/content_settings/core/browser/website_settings_registry.cc b/components/content_settings/core/browser/website_settings_registry.cc
index fe2e048..b10c66a 100644
--- a/components/content_settings/core/browser/website_settings_registry.cc
+++ b/components/content_settings/core/browser/website_settings_registry.cc
@@ -85,10 +85,6 @@ WebsiteSettingsRegistry::WebsiteSettingsRegistry() {
 
   // Deprecated.
   RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream");
-#if defined(OS_WIN)
-  RegisterContentSetting(CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
-                         "metro-switch-to-desktop", CONTENT_SETTING_ASK);
-#endif
 }
 
 WebsiteSettingsRegistry::~WebsiteSettingsRegistry() {}
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index a9f3867..ef9d364 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -57,10 +57,7 @@ ContentSettingsTypeHistogram ContentSettingTypeToHistogramValue(
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_PUSH_MESSAGING;
     case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_SSL_CERT_DECISIONS;
-#if defined(OS_WIN)
-    case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
-      return CONTENT_SETTINGS_TYPE_HISTOGRAM_METRO_SWITCH_TO_DESKTOP;
-#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER;
 #endif
@@ -91,9 +88,6 @@ bool IsContentSettingsTypeSyncable(ContentSettingsType content_setting) {
     case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS:
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
-#if defined(OS_WIN)
-    case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
-#endif
       return true;
 
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
index 7fa6106..94965a2 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -41,9 +41,7 @@ enum ContentSettingsType {
   CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
   CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
   CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
-#if defined(OS_WIN)
-  CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
-#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
   CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
 #endif
   CONTENT_SETTINGS_TYPE_APP_BANNER,