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

chrome/browser/content_settings/content_settings_pref_provider.cc

Index: chrome/browser/content_settings/content_settings_pref_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index 93f5aed1d011ca0c3c19d46079ebcb7f89c62b70..f2d540507d43701f7398e8091144c97dc9abe35a 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_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.
 
@@ -420,8 +420,6 @@ void PrefProvider::ReadContentSettingsFromPref(bool overwrite) {
             found = resource_dictionary->GetIntegerWithoutPathExpansion(
                 resource_identifier, &setting);
             DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
-            setting = ClickToPlayFixup(content_type,
-                                       ContentSetting(setting));
             value_map_.SetValue(pattern_pair.first,
                                 pattern_pair.second,
                                 content_type,
@@ -436,8 +434,6 @@ void PrefProvider::ReadContentSettingsFromPref(bool overwrite) {
           DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
           setting = FixObsoleteCookiePromptMode(content_type,
                                                 ContentSetting(setting));
-          setting = ClickToPlayFixup(content_type,
-                                     ContentSetting(setting));
           value_map_.SetValue(pattern_pair.first,
                               pattern_pair.second,
                               content_type,
@@ -743,7 +739,6 @@ void PrefProvider::MigrateObsoletePerhostPref() {
           ContentSetting setting = IntToContentSetting(setting_int_value);
 
           setting = FixObsoleteCookiePromptMode(content_type, setting);
-          setting = ClickToPlayFixup(content_type, setting);
 
           if (setting != CONTENT_SETTING_DEFAULT) {
             SetWebsiteSetting(