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

chrome/browser/content_settings/cookie_settings.cc

 // 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/cookie_settings.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 165 matching lines @@
     const GURL& url,
     const GURL& first_party_url,
     bool setting_cookie,
     content_settings::SettingSource* source) const {
   if (HostContentSettingsMap::ShouldAllowAllContent(
         url, first_party_url, CONTENT_SETTINGS_TYPE_COOKIES))
     return CONTENT_SETTING_ALLOW;
 
   // First get any host-specific settings.
   content_settings::SettingInfo info;
-  scoped_ptr<base::Value> value(host_content_settings_map_->GetWebsiteSetting(
+  scoped_ptr<base::Value> value = host_content_settings_map_->GetWebsiteSetting(
       url,
       first_party_url,
       CONTENT_SETTINGS_TYPE_COOKIES,
       std::string(),
-      &info));
+      &info);
   if (source)
     *source = info.source;
 
   // If no explicit exception has been made and third-party cookies are blocked
   // by default, apply that rule.
   if (info.primary_pattern.MatchesAllHosts() &&
       info.secondary_pattern.MatchesAllHosts() &&
       ShouldBlockThirdPartyCookies() &&
       !first_party_url.SchemeIs(extensions::kExtensionScheme)) {
     net::StaticCookiePolicy policy(
@@ skipping 20 matching lines @@
 
   base::AutoLock auto_lock(lock_);
   block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean(
       prefs::kBlockThirdPartyCookies);
 }
 
 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
   base::AutoLock auto_lock(lock_);
   return block_third_party_cookies_;
 }