Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: chrome/browser/browsing_data/cookies_tree_model_unittest.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browsing_data/cookies_tree_model.h" 5 #include "chrome/browser/browsing_data/cookies_tree_model.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h" 12 #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
13 #include "chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h " 13 #include "chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h "
14 #include "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h" 14 #include "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h"
15 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h" 15 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
16 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h" 16 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
17 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h" 17 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h"
18 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h" 18 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h"
19 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h" 19 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h"
20 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h " 20 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h "
21 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h" 21 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
22 #include "chrome/browser/browsing_data/mock_browsing_data_service_worker_helper. h" 22 #include "chrome/browser/browsing_data/mock_browsing_data_service_worker_helper. h"
23 #include "chrome/browser/content_settings/cookie_settings_factory.h" 23 #include "chrome/browser/content_settings/cookie_settings_factory.h"
24 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
24 #include "chrome/browser/content_settings/mock_settings_observer.h" 25 #include "chrome/browser/content_settings/mock_settings_observer.h"
25 #include "chrome/test/base/testing_profile.h" 26 #include "chrome/test/base/testing_profile.h"
26 #include "components/content_settings/core/browser/cookie_settings.h" 27 #include "components/content_settings/core/browser/cookie_settings.h"
27 #include "components/content_settings/core/browser/host_content_settings_map.h" 28 #include "components/content_settings/core/browser/host_content_settings_map.h"
28 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
29 #include "content/public/browser/notification_details.h" 30 #include "content/public/browser/notification_details.h"
30 #include "content/public/browser/notification_types.h" 31 #include "content/public/browser/notification_types.h"
31 #include "content/public/test/test_browser_thread_bundle.h" 32 #include "content/public/test/test_browser_thread_bundle.h"
32 #include "net/url_request/url_request_context.h" 33 #include "net/url_request/url_request_context.h"
33 #include "net/url_request/url_request_context_getter.h" 34 #include "net/url_request/url_request_context_getter.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 mock_browsing_data_service_worker_helper_ = 77 mock_browsing_data_service_worker_helper_ =
77 new MockBrowsingDataServiceWorkerHelper(profile_.get()); 78 new MockBrowsingDataServiceWorkerHelper(profile_.get());
78 mock_browsing_data_cache_storage_helper_ = 79 mock_browsing_data_cache_storage_helper_ =
79 new MockBrowsingDataCacheStorageHelper(profile_.get()); 80 new MockBrowsingDataCacheStorageHelper(profile_.get());
80 mock_browsing_data_flash_lso_helper_ = 81 mock_browsing_data_flash_lso_helper_ =
81 new MockBrowsingDataFlashLSOHelper(profile_.get()); 82 new MockBrowsingDataFlashLSOHelper(profile_.get());
82 83
83 const char kExtensionScheme[] = "extensionscheme"; 84 const char kExtensionScheme[] = "extensionscheme";
84 scoped_refptr<content_settings::CookieSettings> cookie_settings = 85 scoped_refptr<content_settings::CookieSettings> cookie_settings =
85 new content_settings::CookieSettings( 86 new content_settings::CookieSettings(
86 profile_->GetHostContentSettingsMap(), profile_->GetPrefs(), 87 HostContentSettingsMapFactory::GetForProfile(profile_.get()),
88 profile_->GetPrefs(),
87 kExtensionScheme); 89 kExtensionScheme);
88 #if defined(ENABLE_EXTENSIONS) 90 #if defined(ENABLE_EXTENSIONS)
89 special_storage_policy_ = 91 special_storage_policy_ =
90 new ExtensionSpecialStoragePolicy(cookie_settings.get()); 92 new ExtensionSpecialStoragePolicy(cookie_settings.get());
91 #endif 93 #endif
92 } 94 }
93 95
94 void TearDown() override { 96 void TearDown() override {
95 mock_browsing_data_service_worker_helper_ = nullptr; 97 mock_browsing_data_service_worker_helper_ = nullptr;
96 mock_browsing_data_cache_storage_helper_ = nullptr; 98 mock_browsing_data_cache_storage_helper_ = nullptr;
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 mock_browsing_data_service_worker_helper_.get(), 1411 mock_browsing_data_service_worker_helper_.get(),
1410 mock_browsing_data_cache_storage_helper_.get(), 1412 mock_browsing_data_cache_storage_helper_.get(),
1411 mock_browsing_data_flash_lso_helper_.get()); 1413 mock_browsing_data_flash_lso_helper_.get());
1412 CookiesTreeModel cookies_model(container, special_storage_policy(), false); 1414 CookiesTreeModel cookies_model(container, special_storage_policy(), false);
1413 1415
1414 mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1"); 1416 mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
1415 mock_browsing_data_cookie_helper_->Notify(); 1417 mock_browsing_data_cookie_helper_->Notify();
1416 1418
1417 TestingProfile profile; 1419 TestingProfile profile;
1418 HostContentSettingsMap* content_settings = 1420 HostContentSettingsMap* content_settings =
1419 profile.GetHostContentSettingsMap(); 1421 HostContentSettingsMapFactory::GetForProfile(&profile);
1420 content_settings::CookieSettings* cookie_settings = 1422 content_settings::CookieSettings* cookie_settings =
1421 CookieSettingsFactory::GetForProfile(&profile).get(); 1423 CookieSettingsFactory::GetForProfile(&profile).get();
1422 MockSettingsObserver observer(content_settings); 1424 MockSettingsObserver observer(content_settings);
1423 1425
1424 CookieTreeRootNode* root = 1426 CookieTreeRootNode* root =
1425 static_cast<CookieTreeRootNode*>(cookies_model.GetRoot()); 1427 static_cast<CookieTreeRootNode*>(cookies_model.GetRoot());
1426 CookieTreeHostNode* origin = 1428 CookieTreeHostNode* origin =
1427 root->GetOrCreateHostNode(host); 1429 root->GetOrCreateHostNode(host);
1428 1430
1429 EXPECT_EQ(1, origin->child_count()); 1431 EXPECT_EQ(1, origin->child_count());
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 1635
1634 cookies_model.UpdateSearchResults( 1636 cookies_model.UpdateSearchResults(
1635 base::string16(base::ASCIIToUTF16("example4.com"))); 1637 base::string16(base::ASCIIToUTF16("example4.com")));
1636 EXPECT_EQ("L", GetDisplayedCookies(&cookies_model)); 1638 EXPECT_EQ("L", GetDisplayedCookies(&cookies_model));
1637 CheckContentSettingsUrlForHostNodes( 1639 CheckContentSettingsUrlForHostNodes(
1638 cookies_model.GetRoot(), CookieTreeNode::DetailedInfo::TYPE_ROOT, 1640 cookies_model.GetRoot(), CookieTreeNode::DetailedInfo::TYPE_ROOT,
1639 cookie_settings, GURL("http://example4.com")); 1641 cookie_settings, GURL("http://example4.com"));
1640 } 1642 }
1641 1643
1642 } // namespace 1644 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698