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

chrome/browser/content_settings/content_settings_pref_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_pref_provider.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 401 matching lines @@
                 res_dictionary_path, &resource_dictionary)) {
           for (DictionaryValue::key_iterator j(
                    resource_dictionary->begin_keys());
                j != resource_dictionary->end_keys();
                ++j) {
             const std::string& resource_identifier(*j);
             int setting = CONTENT_SETTING_DEFAULT;
             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,
                                 resource_identifier,
                                 Value::CreateIntegerValue(setting));
           }
         }
       } else {
         int setting = CONTENT_SETTING_DEFAULT;
         if (settings_dictionary->GetIntegerWithoutPathExpansion(
                 GetTypeName(ContentSettingsType(i)), &setting)) {
           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,
                               ResourceIdentifier(""),
                               Value::CreateIntegerValue(setting));
         }
       }
     }
   }
 }
@@ skipping 285 matching lines @@
 
       for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
         ContentSettingsType content_type = static_cast<ContentSettingsType>(i);
 
         int setting_int_value = CONTENT_SETTING_DEFAULT;
         if (host_settings_dictionary->GetIntegerWithoutPathExpansion(
                 GetTypeName(content_type), &setting_int_value)) {
           ContentSetting setting = IntToContentSetting(setting_int_value);
 
           setting = FixObsoleteCookiePromptMode(content_type, setting);
-          setting = ClickToPlayFixup(content_type, setting);
 
           if (setting != CONTENT_SETTING_DEFAULT) {
             SetWebsiteSetting(
                 pattern,
                 pattern,
                 content_type,
                 "",
                Value::CreateIntegerValue(setting));
           }
         }
@@ skipping 351 matching lines @@
 
 void PrefProvider::AssertLockNotHeld() const {
 #if !defined(NDEBUG)
   // |Lock::Acquire()| will assert if the lock is held by this thread.
   lock_.Acquire();
   lock_.Release();
 #endif
 }
 
 }  // namespace content_settings