Apply third party cookie blocking to all kinds of cookies

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

 // Copyright (c) 2011 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/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ skipping 262 matching lines @@
                    Need_a_setting_for_every_content_settings_type);
     std::string radio_block_label;
     radio_block_label = l10n_util::GetStringUTF8(kBlockIDs[content_type()]);
 
     radio_group.radio_items.push_back(radio_allow_label);
     radio_group.radio_items.push_back(radio_block_label);
     HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
     ContentSetting mostRestrictiveSetting;
     if (resources.empty()) {
       mostRestrictiveSetting =
-          map->GetContentSetting(url, content_type(), std::string());
+          content_type() == CONTENT_SETTINGS_TYPE_COOKIES ?
+              map->GetCookieContentSetting(url, url, true) :
+              map->GetContentSetting(url, content_type(), std::string());
     } else {
       mostRestrictiveSetting = CONTENT_SETTING_ALLOW;
       for (std::set<std::string>::const_iterator it = resources.begin();
            it != resources.end(); ++it) {
         ContentSetting setting = map->GetContentSetting(url,
                                                         content_type(),
                                                         *it);
         if (setting == CONTENT_SETTING_BLOCK) {
           mostRestrictiveSetting = CONTENT_SETTING_BLOCK;
           break;
@@ skipping 255 matching lines @@
   bubble_content_.resource_identifiers.insert(resource_identifier);
 }
 
 void ContentSettingBubbleModel::Observe(NotificationType type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
   DCHECK(source == Source<TabContents>(tab_contents_->tab_contents()));
   tab_contents_ = NULL;
 }