HostContentSettingsMap refactoring.

chrome/browser/cookies_tree_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/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #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"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request_context.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 420 matching lines @@
   if (quota_child_)
     return quota_child_;
   quota_child_ = new CookieTreeQuotaNode(quota_info);
   AddChildSortedByTitle(quota_child_);
   return quota_child_;
 }
 
 void CookieTreeOriginNode::CreateContentException(
     HostContentSettingsMap* content_settings, ContentSetting setting) const {
   if (CanCreateContentException()) {
-    content_settings->AddExceptionForURL(url_,
-                                         url_,
-                                         CONTENT_SETTINGS_TYPE_COOKIES,
-                                         "",
-                                         setting);
+    CookieSettings* cookie_settings = content_settings->GetCookieSettings();
+    cookie_settings->ResetCookieAllowed(
+        ContentSettingsPattern::FromURLNoWildcard(url_),
+        ContentSettingsPattern::Wildcard());
+    cookie_settings->ResetCookieSessionOnly(
+        ContentSettingsPattern::FromURLNoWildcard(url_));
+    bool allow = (setting == CONTENT_SETTING_ALLOW ||
+                  setting == CONTENT_SETTING_SESSION_ONLY);
+    bool session_only = (setting == CONTENT_SETTING_SESSION_ONLY);
+    cookie_settings->SetCookieAllowed(ContentSettingsPattern::FromURL(url_),
+                                      ContentSettingsPattern::Wildcard(),
+                                      allow);
+    cookie_settings->SetCookieSessionOnly(ContentSettingsPattern::FromURL(url_),
+                                          session_only);
   }
 }
 
 bool CookieTreeOriginNode::CanCreateContentException() const {
   return !url_.SchemeIsFile();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieTreeCookiesNode, public:
 
@@ skipping 596 matching lines @@
 
 void CookiesTreeModel::NotifyObserverEndBatch() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (--batch_update_ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
   }
 }