Add a global on/off switch for content settings and expose a toggle on the Website Settings options…

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 102ddb65fae0c0592bc35fa2e2baf0f3f9d36ec9..94fc45afd504b00850a369a43924f0c7ac57d40d 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -356,8 +356,8 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
   } else {
     SettingInfo info;
     HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
-    scoped_ptr<base::Value> value(map->GetWebsiteSetting(
-        url, url, content_type(), std::string(), &info));
+    scoped_ptr<base::Value> value =
+        map->GetWebsiteSetting(url, url, content_type(), std::string(), &info);
     setting = content_settings::ValueToContentSetting(value.get());
     setting_source = info.source;
     setting_is_wildcard =