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

chrome/browser/content_settings/content_settings_default_provider.cc

Index: chrome/browser/content_settings/content_settings_default_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc
index c9987a05deb17a1d043bfd31f5f2682d582b930b..13f60962a6bbece8dec17f5e06315daf1801a681 100644
--- a/chrome/browser/content_settings/content_settings_default_provider.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -349,15 +349,6 @@ void DefaultProvider::GetSettingsFromDictionary(
     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() {