HostContentSettingsMap refactoring.

chrome/browser/cookies_tree_model_unittest.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 <string>
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
@@ skipping 930 matching lines @@
                                  mock_browsing_data_indexed_db_helper_,
                                  mock_browsing_data_file_system_helper_,
                                  mock_browsing_data_quota_helper_,
                                  false);
   mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
   mock_browsing_data_cookie_helper_->Notify();
 
   TestingProfile profile;
   HostContentSettingsMap* content_settings =
       profile.GetHostContentSettingsMap();
+  CookieContentSettings* cookie_content_settings =
+      profile.GetCookieContentSettings();
   MockSettingsObserver observer;
 
   CookieTreeRootNode* root =
       static_cast<CookieTreeRootNode*>(cookies_model.GetRoot());
   CookieTreeOriginNode* origin = root->GetOrCreateOriginNode(host);
 
   EXPECT_EQ(1, origin->child_count());
   EXPECT_TRUE(origin->CanCreateContentException());
   EXPECT_CALL(observer,
               OnContentSettingsChanged(
                   content_settings,
                   CONTENT_SETTINGS_TYPE_COOKIES,
                   false,
                   ContentSettingsPattern::FromURLNoWildcard(host),
                   ContentSettingsPattern::Wildcard(),
                   false));
   EXPECT_CALL(observer,
               OnContentSettingsChanged(content_settings,
                   CONTENT_SETTINGS_TYPE_COOKIES,
                   false,
                   ContentSettingsPattern::FromURL(host),
                   ContentSettingsPattern::Wildcard(),
                   false));
   origin->CreateContentException(
       content_settings, CONTENT_SETTING_SESSION_ONLY);
-  EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY,
-      content_settings->GetCookieContentSetting(host, host, true));
+  EXPECT_TRUE(cookie_content_settings->Allow(host, host, true));
+  EXPECT_TRUE(cookie_content_settings->EnforceSessionOnly(host));
 }
 
 TEST_F(CookiesTreeModelTest, FileSystemFilter) {
   scoped_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
 
   cookies_model->UpdateSearchResults(std::wstring(L"fshost1"));
   EXPECT_EQ("http://fshost1:1/",
             GetDisplayedFileSystems(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(std::wstring(L"fshost2"));
   EXPECT_EQ("http://fshost2:2/",
             GetDisplayedFileSystems(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(std::wstring(L"fshost3"));
   EXPECT_EQ("http://fshost3:3/",
             GetDisplayedFileSystems(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(std::wstring());
   EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
             GetDisplayedFileSystems(cookies_model.get()));
 }
 
 }  // namespace