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

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index e2e123de84f3f0fa3353fe512a55c8e3a53687d6..4470db0f8e024d692b6031b9ca7f1b0f36e16866 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -803,6 +803,14 @@ const char kContentSettingsPatterns[] = "profile.content_settings.patterns";
 const char kContentSettingsPatternPairs[] =
     "profile.content_settings.pattern_pairs";
 
+// Version of the content settings whitelist.
+const char kContentSettingsDefaultWhitelistVersion[] =
+    "profile.content_settings.whitelist_version";
+
+// Which plugins have been whitelisted manually by the user.
+const char kContentSettingsPluginWhitelist[] =
+    "profile.content_settings.plugin_whitelist";
+
 // Boolean that is true if we should unconditionally block third-party cookies,
 // regardless of other content settings.
 const char kBlockThirdPartyCookies[] = "profile.block_third_party_cookies";