Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play.

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

Index: chrome/browser/ui/webui/options/content_settings_handler.h
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h
index a7e42c996df4364bd05c96e36515e292ff9b48bd..363c5a209a68a33239603a69eb5d22d6e77dba59 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -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.
 
@@ -10,6 +10,7 @@
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/content_settings_types.h"
+#include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -87,6 +88,10 @@ class ContentSettingsHandler : public OptionsPageUIHandler {
 
   // Utility functions ---------------------------------------------------------
 
+  // Applies content settings whitelists to reduce breakage / user confusion.
+  void ApplyWhitelist(ContentSettingsType content_type,
+                      ContentSetting default_setting);
+
   // Gets the HostContentSettingsMap for the normal profile.
   HostContentSettingsMap* GetContentSettingsMap();