| Index: chrome/browser/cookies_tree_model.cc
|
| diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
|
| index f0ed602fbe8f698be851e850d281864c7b16801c..ed395a6624600fa28a0f48e1960da02e0e3634bb 100644
|
| --- a/chrome/browser/cookies_tree_model.cc
|
| +++ b/chrome/browser/cookies_tree_model.cc
|
| @@ -14,6 +14,8 @@
|
| #include "base/string_util.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/browsing_data_cookie_helper.h"
|
| +#include "chrome/browser/content_settings/content_settings_pattern.h"
|
| +#include "chrome/browser/content_settings/cookie_settings.h"
|
| #include "chrome/browser/content_settings/host_content_settings_map.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "content/browser/in_process_webkit/webkit_context.h"
|
| @@ -450,13 +452,13 @@ CookieTreeQuotaNode* CookieTreeOriginNode::UpdateOrCreateQuotaNode(
|
| }
|
|
|
| void CookieTreeOriginNode::CreateContentException(
|
| - HostContentSettingsMap* content_settings, ContentSetting setting) const {
|
| + CookieSettings* cookie_settings,
|
| + ContentSetting setting) const {
|
| if (CanCreateContentException()) {
|
| - content_settings->AddExceptionForURL(url_,
|
| - url_,
|
| - CONTENT_SETTINGS_TYPE_COOKIES,
|
| - "",
|
| - setting);
|
| + cookie_settings->ResetCookieSetting(
|
| + ContentSettingsPattern::FromURLNoWildcard(url_));
|
| + cookie_settings->SetCookieSetting(ContentSettingsPattern::FromURL(url_),
|
| + setting);
|
| }
|
| }
|
|
|
|
|