Merge 119773 - Move click-to-play out of chrome://flags.

chrome/browser/content_settings/content_settings_default_provider.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/content_settings/content_settings_default_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 330 matching lines @@
       }
     }
   }
   // Migrate obsolete cookie prompt mode.
   if (ValueToContentSetting(
           default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==
               CONTENT_SETTING_ASK) {
     default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(
         Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
   }
-
-  if (default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].get()) {
-    ContentSetting plugin_setting = ValueToContentSetting(
-        default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].get());
-    plugin_setting =
-        ClickToPlayFixup(CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);
-    default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].reset(
-        Value::CreateIntegerValue(plugin_setting));
-  }
 }
 
 void DefaultProvider::MigrateObsoleteNotificationPref() {
   if (prefs_->HasPrefPath(prefs::kDesktopNotificationDefaultContentSetting)) {
     const base::Value* value = prefs_->FindPreference(
         prefs::kDesktopNotificationDefaultContentSetting)->GetValue();
     // Do not clear the old preference yet as long as we need to maintain
     // backward compatibility.
     SetWebsiteSetting(
         ContentSettingsPattern::Wildcard(),
@@ skipping 14 matching lines @@
     SetWebsiteSetting(
         ContentSettingsPattern::Wildcard(),
         ContentSettingsPattern::Wildcard(),
         CONTENT_SETTINGS_TYPE_GEOLOCATION,
         std::string(),
         value->DeepCopy());
   }
 }
 
 }  // namespace content_settings