Remove Google Talk plugin whitelisting now that b/11355273 is fixed.

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2012 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/browser/ui/webui/options/content_settings_handler.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 1218 matching lines @@
       base::Bind(&ContentSettingsHandler::RemoveException,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setException",
       base::Bind(&ContentSettingsHandler::SetException,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("checkExceptionPatternValidity",
       base::Bind(&ContentSettingsHandler::CheckExceptionPatternValidity,
                  base::Unretained(this)));
 }
 
-void ContentSettingsHandler::ApplyWhitelist(ContentSettingsType content_type,
-                                            ContentSetting default_setting) {
-  HostContentSettingsMap* map = GetContentSettingsMap();
-  if (content_type != CONTENT_SETTINGS_TYPE_PLUGINS)
-    return;
-  const int kDefaultWhitelistVersion = 1;
-  PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
-  int version = prefs->GetInteger(
-      prefs::kContentSettingsDefaultWhitelistVersion);
-  if (version >= kDefaultWhitelistVersion)
-    return;
-  ContentSetting old_setting =
-      map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, NULL);
-  // TODO(bauerb): Remove this once the Google Talk plug-in works nicely with
-  // click-to-play (b/6090625).
-  if (old_setting == CONTENT_SETTING_ALLOW &&
-      default_setting == CONTENT_SETTING_ASK) {
-    map->SetWebsiteSetting(
-        ContentSettingsPattern::Wildcard(),
-        ContentSettingsPattern::Wildcard(),
-        CONTENT_SETTINGS_TYPE_PLUGINS,
-        "google-talk",
-        new base::FundamentalValue(CONTENT_SETTING_ALLOW));
-  }
-  prefs->SetInteger(prefs::kContentSettingsDefaultWhitelistVersion,
-                    kDefaultWhitelistVersion);
-}
-
 void ContentSettingsHandler::SetContentFilter(const base::ListValue* args) {
   DCHECK_EQ(2U, args->GetSize());
   std::string group, setting;
   if (!(args->GetString(0, &group) &&
         args->GetString(1, &setting))) {
     NOTREACHED();
     return;
   }
 
   ContentSetting default_setting = ContentSettingFromString(setting);
   ContentSettingsType content_type = ContentSettingsTypeFromGroupName(group);
   Profile* profile = Profile::FromWebUI(web_ui());
 
 #if defined(OS_CHROMEOS)
   // ChromeOS special case : in Guest mode settings are opened in Incognito
   // mode, so we need original profile to actually modify settings.
   if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
     profile = profile->GetOriginalProfile();
 #endif
 
 
   HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
-  ApplyWhitelist(content_type, default_setting);
   map->SetDefaultContentSetting(content_type, default_setting);
 
   switch (content_type) {
     case CONTENT_SETTINGS_TYPE_COOKIES:
       content::RecordAction(
           UserMetricsAction("Options_DefaultCookieSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_IMAGES:
       content::RecordAction(
           UserMetricsAction("Options_DefaultImagesSettingChanged"));
@@ skipping 238 matching lines @@
 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   // Exceptions apply only when the feature is enabled.
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options