OLD | NEW |
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/cookies_tree_model.h" | 5 #include "chrome/browser/cookies_tree_model.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "chrome/browser/content_settings/cookie_settings.h" | 10 #include "chrome/browser/content_settings/cookie_settings.h" |
11 #include "chrome/browser/content_settings/host_content_settings_map.h" | 11 #include "chrome/browser/content_settings/host_content_settings_map.h" |
12 #include "chrome/browser/content_settings/mock_settings_observer.h" | 12 #include "chrome/browser/content_settings/mock_settings_observer.h" |
| 13 #include "chrome/browser/extensions/extension_special_storage_policy.h" |
13 #include "chrome/browser/mock_browsing_data_appcache_helper.h" | 14 #include "chrome/browser/mock_browsing_data_appcache_helper.h" |
14 #include "chrome/browser/mock_browsing_data_cookie_helper.h" | 15 #include "chrome/browser/mock_browsing_data_cookie_helper.h" |
15 #include "chrome/browser/mock_browsing_data_database_helper.h" | 16 #include "chrome/browser/mock_browsing_data_database_helper.h" |
16 #include "chrome/browser/mock_browsing_data_file_system_helper.h" | 17 #include "chrome/browser/mock_browsing_data_file_system_helper.h" |
17 #include "chrome/browser/mock_browsing_data_indexed_db_helper.h" | 18 #include "chrome/browser/mock_browsing_data_indexed_db_helper.h" |
18 #include "chrome/browser/mock_browsing_data_local_storage_helper.h" | 19 #include "chrome/browser/mock_browsing_data_local_storage_helper.h" |
19 #include "chrome/browser/mock_browsing_data_quota_helper.h" | 20 #include "chrome/browser/mock_browsing_data_quota_helper.h" |
20 #include "chrome/browser/mock_browsing_data_server_bound_cert_helper.h" | 21 #include "chrome/browser/mock_browsing_data_server_bound_cert_helper.h" |
21 #include "chrome/test/base/testing_profile.h" | 22 #include "chrome/test/base/testing_profile.h" |
22 #include "content/public/browser/notification_details.h" | 23 #include "content/public/browser/notification_details.h" |
(...skipping 13 matching lines...) Expand all Loading... |
36 class CookiesTreeModelTest : public testing::Test { | 37 class CookiesTreeModelTest : public testing::Test { |
37 public: | 38 public: |
38 CookiesTreeModelTest() | 39 CookiesTreeModelTest() |
39 : ui_thread_(BrowserThread::UI, &message_loop_), | 40 : ui_thread_(BrowserThread::UI, &message_loop_), |
40 file_user_blocking_(BrowserThread::FILE_USER_BLOCKING, &message_loop_), | 41 file_user_blocking_(BrowserThread::FILE_USER_BLOCKING, &message_loop_), |
41 io_thread_(BrowserThread::IO, &message_loop_) { | 42 io_thread_(BrowserThread::IO, &message_loop_) { |
42 } | 43 } |
43 | 44 |
44 virtual ~CookiesTreeModelTest() { | 45 virtual ~CookiesTreeModelTest() { |
45 // Avoid memory leaks. | 46 // Avoid memory leaks. |
| 47 special_storage_policy_ = NULL; |
46 profile_.reset(); | 48 profile_.reset(); |
47 message_loop_.RunAllPending(); | 49 message_loop_.RunAllPending(); |
48 } | 50 } |
49 | 51 |
50 virtual void SetUp() OVERRIDE { | 52 virtual void SetUp() OVERRIDE { |
51 profile_.reset(new TestingProfile()); | 53 profile_.reset(new TestingProfile()); |
52 profile_->CreateRequestContext(); | 54 profile_->CreateRequestContext(); |
53 mock_browsing_data_cookie_helper_ = | 55 mock_browsing_data_cookie_helper_ = |
54 new MockBrowsingDataCookieHelper(profile_->GetRequestContext()); | 56 new MockBrowsingDataCookieHelper(profile_->GetRequestContext()); |
55 mock_browsing_data_database_helper_ = | 57 mock_browsing_data_database_helper_ = |
56 new MockBrowsingDataDatabaseHelper(profile_.get()); | 58 new MockBrowsingDataDatabaseHelper(profile_.get()); |
57 mock_browsing_data_local_storage_helper_ = | 59 mock_browsing_data_local_storage_helper_ = |
58 new MockBrowsingDataLocalStorageHelper(profile_.get()); | 60 new MockBrowsingDataLocalStorageHelper(profile_.get()); |
59 mock_browsing_data_session_storage_helper_ = | 61 mock_browsing_data_session_storage_helper_ = |
60 new MockBrowsingDataLocalStorageHelper(profile_.get()); | 62 new MockBrowsingDataLocalStorageHelper(profile_.get()); |
61 mock_browsing_data_appcache_helper_ = | 63 mock_browsing_data_appcache_helper_ = |
62 new MockBrowsingDataAppCacheHelper(profile_.get()); | 64 new MockBrowsingDataAppCacheHelper(profile_.get()); |
63 mock_browsing_data_indexed_db_helper_ = | 65 mock_browsing_data_indexed_db_helper_ = |
64 new MockBrowsingDataIndexedDBHelper(); | 66 new MockBrowsingDataIndexedDBHelper(); |
65 mock_browsing_data_file_system_helper_ = | 67 mock_browsing_data_file_system_helper_ = |
66 new MockBrowsingDataFileSystemHelper(profile_.get()); | 68 new MockBrowsingDataFileSystemHelper(profile_.get()); |
67 mock_browsing_data_quota_helper_ = | 69 mock_browsing_data_quota_helper_ = |
68 new MockBrowsingDataQuotaHelper(profile_.get()); | 70 new MockBrowsingDataQuotaHelper(profile_.get()); |
69 mock_browsing_data_server_bound_cert_helper_ = | 71 mock_browsing_data_server_bound_cert_helper_ = |
70 new MockBrowsingDataServerBoundCertHelper(); | 72 new MockBrowsingDataServerBoundCertHelper(); |
| 73 scoped_refptr<CookieSettings> cookie_settings = |
| 74 new CookieSettings(profile_->GetHostContentSettingsMap(), |
| 75 profile_->GetPrefs()); |
| 76 special_storage_policy_ = |
| 77 new ExtensionSpecialStoragePolicy(cookie_settings); |
71 } | 78 } |
72 | 79 |
73 virtual void TearDown() OVERRIDE { | 80 virtual void TearDown() OVERRIDE { |
74 mock_browsing_data_server_bound_cert_helper_ = NULL; | 81 mock_browsing_data_server_bound_cert_helper_ = NULL; |
75 mock_browsing_data_quota_helper_ = NULL; | 82 mock_browsing_data_quota_helper_ = NULL; |
76 mock_browsing_data_file_system_helper_ = NULL; | 83 mock_browsing_data_file_system_helper_ = NULL; |
77 mock_browsing_data_indexed_db_helper_ = NULL; | 84 mock_browsing_data_indexed_db_helper_ = NULL; |
78 mock_browsing_data_appcache_helper_ = NULL; | 85 mock_browsing_data_appcache_helper_ = NULL; |
79 mock_browsing_data_session_storage_helper_ = NULL; | 86 mock_browsing_data_session_storage_helper_ = NULL; |
80 mock_browsing_data_local_storage_helper_ = NULL; | 87 mock_browsing_data_local_storage_helper_ = NULL; |
81 mock_browsing_data_database_helper_ = NULL; | 88 mock_browsing_data_database_helper_ = NULL; |
82 message_loop_.RunAllPending(); | 89 message_loop_.RunAllPending(); |
83 } | 90 } |
84 | 91 |
85 CookiesTreeModel* CreateCookiesTreeModelWithInitialSample() { | 92 scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() { |
86 CookiesTreeModel* cookies_model = new CookiesTreeModel( | 93 CookiesTreeModel* cookies_model = new CookiesTreeModel( |
87 mock_browsing_data_cookie_helper_, | 94 mock_browsing_data_cookie_helper_, |
88 mock_browsing_data_database_helper_, | 95 mock_browsing_data_database_helper_, |
89 mock_browsing_data_local_storage_helper_, | 96 mock_browsing_data_local_storage_helper_, |
90 mock_browsing_data_session_storage_helper_, | 97 mock_browsing_data_session_storage_helper_, |
91 mock_browsing_data_appcache_helper_, | 98 mock_browsing_data_appcache_helper_, |
92 mock_browsing_data_indexed_db_helper_, | 99 mock_browsing_data_indexed_db_helper_, |
93 mock_browsing_data_file_system_helper_, | 100 mock_browsing_data_file_system_helper_, |
94 mock_browsing_data_quota_helper_, | 101 mock_browsing_data_quota_helper_, |
95 mock_browsing_data_server_bound_cert_helper_, | 102 mock_browsing_data_server_bound_cert_helper_, |
| 103 special_storage_policy_, |
96 false); | 104 false); |
97 mock_browsing_data_cookie_helper_-> | 105 mock_browsing_data_cookie_helper_-> |
98 AddCookieSamples(GURL("http://foo1"), "A=1"); | 106 AddCookieSamples(GURL("http://foo1"), "A=1"); |
99 mock_browsing_data_cookie_helper_-> | 107 mock_browsing_data_cookie_helper_-> |
100 AddCookieSamples(GURL("http://foo2"), "B=1"); | 108 AddCookieSamples(GURL("http://foo2"), "B=1"); |
101 mock_browsing_data_cookie_helper_-> | 109 mock_browsing_data_cookie_helper_-> |
102 AddCookieSamples(GURL("http://foo3"), "C=1"); | 110 AddCookieSamples(GURL("http://foo3"), "C=1"); |
103 mock_browsing_data_cookie_helper_->Notify(); | 111 mock_browsing_data_cookie_helper_->Notify(); |
104 mock_browsing_data_database_helper_->AddDatabaseSamples(); | 112 mock_browsing_data_database_helper_->AddDatabaseSamples(); |
105 mock_browsing_data_database_helper_->Notify(); | 113 mock_browsing_data_database_helper_->Notify(); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 GetDisplayedSessionStorages(cookies_model)); | 155 GetDisplayedSessionStorages(cookies_model)); |
148 EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/", | 156 EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/", |
149 GetDisplayedIndexedDBs(cookies_model)); | 157 GetDisplayedIndexedDBs(cookies_model)); |
150 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", | 158 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", |
151 GetDisplayedFileSystems(cookies_model)); | 159 GetDisplayedFileSystems(cookies_model)); |
152 EXPECT_EQ("quotahost1,quotahost2", | 160 EXPECT_EQ("quotahost1,quotahost2", |
153 GetDisplayedQuotas(cookies_model)); | 161 GetDisplayedQuotas(cookies_model)); |
154 EXPECT_EQ("sbc1,sbc2", | 162 EXPECT_EQ("sbc1,sbc2", |
155 GetDisplayedServerBoundCerts(cookies_model)); | 163 GetDisplayedServerBoundCerts(cookies_model)); |
156 } | 164 } |
157 return cookies_model; | 165 return make_scoped_ptr(cookies_model); |
158 } | 166 } |
159 | 167 |
160 std::string GetNodesOfChildren( | 168 std::string GetNodesOfChildren( |
161 const CookieTreeNode* node, | 169 const CookieTreeNode* node, |
162 CookieTreeNode::DetailedInfo::NodeType node_type) { | 170 CookieTreeNode::DetailedInfo::NodeType node_type) { |
163 if (!node->empty()) { | 171 if (!node->empty()) { |
164 std::string retval; | 172 std::string retval; |
165 for (int i = 0; i < node->child_count(); ++i) { | 173 for (int i = 0; i < node->child_count(); ++i) { |
166 retval += GetNodesOfChildren(node->GetChild(i), node_type); | 174 retval += GetNodesOfChildren(node->GetChild(i), node_type); |
167 } | 175 } |
168 return retval; | 176 return retval; |
169 } else { | 177 } |
170 if (node->GetDetailedInfo().node_type == node_type) { | 178 |
171 switch (node_type) { | 179 if (node->GetDetailedInfo().node_type != node_type) |
172 case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE: | 180 return std::string(); |
173 return node->GetDetailedInfo(). | 181 |
174 session_storage_info->origin_url.spec() + ","; | 182 switch (node_type) { |
175 case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: | 183 case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE: |
176 return node->GetDetailedInfo(). | 184 return node->GetDetailedInfo(). |
177 local_storage_info->origin_url.spec() + ","; | 185 session_storage_info->origin_url.spec() + ","; |
178 case CookieTreeNode::DetailedInfo::TYPE_DATABASE: | 186 case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: |
179 return node->GetDetailedInfo().database_info->database_name + ","; | 187 return node->GetDetailedInfo(). |
180 case CookieTreeNode::DetailedInfo::TYPE_COOKIE: | 188 local_storage_info->origin_url.spec() + ","; |
181 return node->GetDetailedInfo().cookie->Name() + ","; | 189 case CookieTreeNode::DetailedInfo::TYPE_DATABASE: |
182 case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: | 190 return node->GetDetailedInfo().database_info->database_name + ","; |
183 return node->GetDetailedInfo().appcache_info->manifest_url.spec() + | 191 case CookieTreeNode::DetailedInfo::TYPE_COOKIE: |
184 ","; | 192 return node->GetDetailedInfo().cookie->Name() + ","; |
185 case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: | 193 case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: |
186 return node->GetDetailedInfo().indexed_db_info->origin.spec() + | 194 return node->GetDetailedInfo().appcache_info->manifest_url.spec() + |
187 ","; | 195 ","; |
188 case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: | 196 case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: |
189 return node->GetDetailedInfo().file_system_info->origin.spec() + | 197 return node->GetDetailedInfo().indexed_db_info->origin.spec() + |
190 ","; | 198 ","; |
191 case CookieTreeNode::DetailedInfo::TYPE_QUOTA: | 199 case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: |
192 return node->GetDetailedInfo().quota_info->host + ","; | 200 return node->GetDetailedInfo().file_system_info->origin.spec() + |
193 case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT: | 201 ","; |
194 return node->GetDetailedInfo( | 202 case CookieTreeNode::DetailedInfo::TYPE_QUOTA: |
195 ).server_bound_cert->server_identifier() + ","; | 203 return node->GetDetailedInfo().quota_info->host + ","; |
196 default: | 204 case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT: |
197 return ""; | 205 return node->GetDetailedInfo( |
198 } | 206 ).server_bound_cert->server_identifier() + ","; |
199 } else { | 207 default: |
200 return ""; | 208 return std::string(); |
201 } | |
202 } | 209 } |
203 } | 210 } |
204 | 211 |
205 std::string GetCookiesOfChildren(const CookieTreeNode* node) { | 212 std::string GetCookiesOfChildren(const CookieTreeNode* node) { |
206 return GetNodesOfChildren(node, CookieTreeNode::DetailedInfo::TYPE_COOKIE); | 213 return GetNodesOfChildren(node, CookieTreeNode::DetailedInfo::TYPE_COOKIE); |
207 } | 214 } |
208 | 215 |
209 std::string GetDatabasesOfChildren(const CookieTreeNode* node) { | 216 std::string GetDatabasesOfChildren(const CookieTreeNode* node) { |
210 return GetNodesOfChildren(node, | 217 return GetNodesOfChildren(node, |
211 CookieTreeNode::DetailedInfo::TYPE_DATABASE); | 218 CookieTreeNode::DetailedInfo::TYPE_DATABASE); |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 scoped_refptr<MockBrowsingDataAppCacheHelper> | 327 scoped_refptr<MockBrowsingDataAppCacheHelper> |
321 mock_browsing_data_appcache_helper_; | 328 mock_browsing_data_appcache_helper_; |
322 scoped_refptr<MockBrowsingDataIndexedDBHelper> | 329 scoped_refptr<MockBrowsingDataIndexedDBHelper> |
323 mock_browsing_data_indexed_db_helper_; | 330 mock_browsing_data_indexed_db_helper_; |
324 scoped_refptr<MockBrowsingDataFileSystemHelper> | 331 scoped_refptr<MockBrowsingDataFileSystemHelper> |
325 mock_browsing_data_file_system_helper_; | 332 mock_browsing_data_file_system_helper_; |
326 scoped_refptr<MockBrowsingDataQuotaHelper> | 333 scoped_refptr<MockBrowsingDataQuotaHelper> |
327 mock_browsing_data_quota_helper_; | 334 mock_browsing_data_quota_helper_; |
328 scoped_refptr<MockBrowsingDataServerBoundCertHelper> | 335 scoped_refptr<MockBrowsingDataServerBoundCertHelper> |
329 mock_browsing_data_server_bound_cert_helper_; | 336 mock_browsing_data_server_bound_cert_helper_; |
| 337 scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_; |
330 }; | 338 }; |
331 | 339 |
332 TEST_F(CookiesTreeModelTest, RemoveAll) { | 340 TEST_F(CookiesTreeModelTest, RemoveAll) { |
333 scoped_ptr<CookiesTreeModel> cookies_model( | 341 scoped_ptr<CookiesTreeModel> cookies_model( |
334 CreateCookiesTreeModelWithInitialSample()); | 342 CreateCookiesTreeModelWithInitialSample()); |
335 | 343 |
336 // Reset the selection of the first row. | 344 // Reset the selection of the first row. |
337 { | 345 { |
338 SCOPED_TRACE("Before removing"); | 346 SCOPED_TRACE("Before removing"); |
339 EXPECT_EQ("A,B,C", | 347 EXPECT_EQ("A,B,C", |
(...skipping 18 matching lines...) Expand all Loading... |
358 mock_browsing_data_database_helper_->Reset(); | 366 mock_browsing_data_database_helper_->Reset(); |
359 mock_browsing_data_local_storage_helper_->Reset(); | 367 mock_browsing_data_local_storage_helper_->Reset(); |
360 mock_browsing_data_session_storage_helper_->Reset(); | 368 mock_browsing_data_session_storage_helper_->Reset(); |
361 mock_browsing_data_indexed_db_helper_->Reset(); | 369 mock_browsing_data_indexed_db_helper_->Reset(); |
362 mock_browsing_data_file_system_helper_->Reset(); | 370 mock_browsing_data_file_system_helper_->Reset(); |
363 | 371 |
364 cookies_model->DeleteAllStoredObjects(); | 372 cookies_model->DeleteAllStoredObjects(); |
365 | 373 |
366 // Make sure the nodes are also deleted from the model's cache. | 374 // Make sure the nodes are also deleted from the model's cache. |
367 // http://crbug.com/43249 | 375 // http://crbug.com/43249 |
368 cookies_model->UpdateSearchResults(std::wstring()); | 376 cookies_model->UpdateSearchResults(string16()); |
369 | 377 |
370 { | 378 { |
371 SCOPED_TRACE("After removing"); | 379 SCOPED_TRACE("After removing"); |
372 EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount()); | 380 EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount()); |
373 EXPECT_EQ(0, cookies_model->GetRoot()->child_count()); | 381 EXPECT_EQ(0, cookies_model->GetRoot()->child_count()); |
374 EXPECT_EQ(std::string(""), GetDisplayedCookies(cookies_model.get())); | 382 EXPECT_EQ(std::string(""), GetDisplayedCookies(cookies_model.get())); |
375 EXPECT_TRUE(mock_browsing_data_cookie_helper_->AllDeleted()); | 383 EXPECT_TRUE(mock_browsing_data_cookie_helper_->AllDeleted()); |
376 EXPECT_TRUE(mock_browsing_data_database_helper_->AllDeleted()); | 384 EXPECT_TRUE(mock_browsing_data_database_helper_->AllDeleted()); |
377 EXPECT_TRUE(mock_browsing_data_local_storage_helper_->AllDeleted()); | 385 EXPECT_TRUE(mock_browsing_data_local_storage_helper_->AllDeleted()); |
378 EXPECT_FALSE(mock_browsing_data_session_storage_helper_->AllDeleted()); | 386 EXPECT_FALSE(mock_browsing_data_session_storage_helper_->AllDeleted()); |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) { | 784 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) { |
777 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, | 785 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, |
778 mock_browsing_data_database_helper_, | 786 mock_browsing_data_database_helper_, |
779 mock_browsing_data_local_storage_helper_, | 787 mock_browsing_data_local_storage_helper_, |
780 mock_browsing_data_session_storage_helper_, | 788 mock_browsing_data_session_storage_helper_, |
781 mock_browsing_data_appcache_helper_, | 789 mock_browsing_data_appcache_helper_, |
782 mock_browsing_data_indexed_db_helper_, | 790 mock_browsing_data_indexed_db_helper_, |
783 mock_browsing_data_file_system_helper_, | 791 mock_browsing_data_file_system_helper_, |
784 mock_browsing_data_quota_helper_, | 792 mock_browsing_data_quota_helper_, |
785 mock_browsing_data_server_bound_cert_helper_, | 793 mock_browsing_data_server_bound_cert_helper_, |
| 794 special_storage_policy_, |
786 false); | 795 false); |
787 mock_browsing_data_cookie_helper_-> | 796 mock_browsing_data_cookie_helper_-> |
788 AddCookieSamples(GURL("http://foo1"), "A=1"); | 797 AddCookieSamples(GURL("http://foo1"), "A=1"); |
789 mock_browsing_data_cookie_helper_-> | 798 mock_browsing_data_cookie_helper_-> |
790 AddCookieSamples(GURL("http://foo2"), "B=1"); | 799 AddCookieSamples(GURL("http://foo2"), "B=1"); |
791 mock_browsing_data_cookie_helper_-> | 800 mock_browsing_data_cookie_helper_-> |
792 AddCookieSamples(GURL("http://foo3"), "C=1"); | 801 AddCookieSamples(GURL("http://foo3"), "C=1"); |
793 mock_browsing_data_cookie_helper_-> | 802 mock_browsing_data_cookie_helper_-> |
794 AddCookieSamples(GURL("http://foo3"), "D=1"); | 803 AddCookieSamples(GURL("http://foo3"), "D=1"); |
795 mock_browsing_data_cookie_helper_->Notify(); | 804 mock_browsing_data_cookie_helper_->Notify(); |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
857 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) { | 866 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) { |
858 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, | 867 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, |
859 mock_browsing_data_database_helper_, | 868 mock_browsing_data_database_helper_, |
860 mock_browsing_data_local_storage_helper_, | 869 mock_browsing_data_local_storage_helper_, |
861 mock_browsing_data_session_storage_helper_, | 870 mock_browsing_data_session_storage_helper_, |
862 mock_browsing_data_appcache_helper_, | 871 mock_browsing_data_appcache_helper_, |
863 mock_browsing_data_indexed_db_helper_, | 872 mock_browsing_data_indexed_db_helper_, |
864 mock_browsing_data_file_system_helper_, | 873 mock_browsing_data_file_system_helper_, |
865 mock_browsing_data_quota_helper_, | 874 mock_browsing_data_quota_helper_, |
866 mock_browsing_data_server_bound_cert_helper_, | 875 mock_browsing_data_server_bound_cert_helper_, |
| 876 special_storage_policy_, |
867 false); | 877 false); |
868 mock_browsing_data_cookie_helper_-> | 878 mock_browsing_data_cookie_helper_-> |
869 AddCookieSamples(GURL("http://foo1"), "A=1"); | 879 AddCookieSamples(GURL("http://foo1"), "A=1"); |
870 mock_browsing_data_cookie_helper_-> | 880 mock_browsing_data_cookie_helper_-> |
871 AddCookieSamples(GURL("http://foo2"), "B=1"); | 881 AddCookieSamples(GURL("http://foo2"), "B=1"); |
872 mock_browsing_data_cookie_helper_-> | 882 mock_browsing_data_cookie_helper_-> |
873 AddCookieSamples(GURL("http://foo3"), "C=1"); | 883 AddCookieSamples(GURL("http://foo3"), "C=1"); |
874 mock_browsing_data_cookie_helper_-> | 884 mock_browsing_data_cookie_helper_-> |
875 AddCookieSamples(GURL("http://foo3"), "D=1"); | 885 AddCookieSamples(GURL("http://foo3"), "D=1"); |
876 mock_browsing_data_cookie_helper_-> | 886 mock_browsing_data_cookie_helper_-> |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
942 TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) { | 952 TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) { |
943 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, | 953 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, |
944 mock_browsing_data_database_helper_, | 954 mock_browsing_data_database_helper_, |
945 mock_browsing_data_local_storage_helper_, | 955 mock_browsing_data_local_storage_helper_, |
946 mock_browsing_data_session_storage_helper_, | 956 mock_browsing_data_session_storage_helper_, |
947 mock_browsing_data_appcache_helper_, | 957 mock_browsing_data_appcache_helper_, |
948 mock_browsing_data_indexed_db_helper_, | 958 mock_browsing_data_indexed_db_helper_, |
949 mock_browsing_data_file_system_helper_, | 959 mock_browsing_data_file_system_helper_, |
950 mock_browsing_data_quota_helper_, | 960 mock_browsing_data_quota_helper_, |
951 mock_browsing_data_server_bound_cert_helper_, | 961 mock_browsing_data_server_bound_cert_helper_, |
| 962 special_storage_policy_, |
952 false); | 963 false); |
953 mock_browsing_data_cookie_helper_-> | 964 mock_browsing_data_cookie_helper_-> |
954 AddCookieSamples(GURL("http://foo1"), "A=1"); | 965 AddCookieSamples(GURL("http://foo1"), "A=1"); |
955 mock_browsing_data_cookie_helper_-> | 966 mock_browsing_data_cookie_helper_-> |
956 AddCookieSamples(GURL("http://foo2"), "B=1"); | 967 AddCookieSamples(GURL("http://foo2"), "B=1"); |
957 mock_browsing_data_cookie_helper_-> | 968 mock_browsing_data_cookie_helper_-> |
958 AddCookieSamples(GURL("http://foo3"), "C=1"); | 969 AddCookieSamples(GURL("http://foo3"), "C=1"); |
959 mock_browsing_data_cookie_helper_-> | 970 mock_browsing_data_cookie_helper_-> |
960 AddCookieSamples(GURL("http://foo3"), "D=1"); | 971 AddCookieSamples(GURL("http://foo3"), "D=1"); |
961 mock_browsing_data_cookie_helper_-> | 972 mock_browsing_data_cookie_helper_-> |
(...skipping 19 matching lines...) Expand all Loading... |
981 TEST_F(CookiesTreeModelTest, OriginOrdering) { | 992 TEST_F(CookiesTreeModelTest, OriginOrdering) { |
982 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, | 993 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, |
983 mock_browsing_data_database_helper_, | 994 mock_browsing_data_database_helper_, |
984 mock_browsing_data_local_storage_helper_, | 995 mock_browsing_data_local_storage_helper_, |
985 mock_browsing_data_session_storage_helper_, | 996 mock_browsing_data_session_storage_helper_, |
986 mock_browsing_data_appcache_helper_, | 997 mock_browsing_data_appcache_helper_, |
987 mock_browsing_data_indexed_db_helper_, | 998 mock_browsing_data_indexed_db_helper_, |
988 mock_browsing_data_file_system_helper_, | 999 mock_browsing_data_file_system_helper_, |
989 mock_browsing_data_quota_helper_, | 1000 mock_browsing_data_quota_helper_, |
990 mock_browsing_data_server_bound_cert_helper_, | 1001 mock_browsing_data_server_bound_cert_helper_, |
| 1002 special_storage_policy_, |
991 false); | 1003 false); |
992 mock_browsing_data_cookie_helper_-> | 1004 mock_browsing_data_cookie_helper_-> |
993 AddCookieSamples(GURL("http://a.foo2.com"), "A=1"); | 1005 AddCookieSamples(GURL("http://a.foo2.com"), "A=1"); |
994 mock_browsing_data_cookie_helper_-> | 1006 mock_browsing_data_cookie_helper_-> |
995 AddCookieSamples(GURL("http://foo2.com"), "B=1"); | 1007 AddCookieSamples(GURL("http://foo2.com"), "B=1"); |
996 mock_browsing_data_cookie_helper_-> | 1008 mock_browsing_data_cookie_helper_-> |
997 AddCookieSamples(GURL("http://b.foo1.com"), "C=1"); | 1009 AddCookieSamples(GURL("http://b.foo1.com"), "C=1"); |
998 // Leading dot on the foo4 | 1010 // Leading dot on the foo4 |
999 mock_browsing_data_cookie_helper_->AddCookieSamples( | 1011 mock_browsing_data_cookie_helper_->AddCookieSamples( |
1000 GURL("http://foo4.com"), "D=1; domain=.foo4.com; path=/;"); | 1012 GURL("http://foo4.com"), "D=1; domain=.foo4.com; path=/;"); |
(...skipping 23 matching lines...) Expand all Loading... |
1024 GURL host("http://example.com/"); | 1036 GURL host("http://example.com/"); |
1025 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, | 1037 CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_, |
1026 mock_browsing_data_database_helper_, | 1038 mock_browsing_data_database_helper_, |
1027 mock_browsing_data_local_storage_helper_, | 1039 mock_browsing_data_local_storage_helper_, |
1028 mock_browsing_data_session_storage_helper_, | 1040 mock_browsing_data_session_storage_helper_, |
1029 mock_browsing_data_appcache_helper_, | 1041 mock_browsing_data_appcache_helper_, |
1030 mock_browsing_data_indexed_db_helper_, | 1042 mock_browsing_data_indexed_db_helper_, |
1031 mock_browsing_data_file_system_helper_, | 1043 mock_browsing_data_file_system_helper_, |
1032 mock_browsing_data_quota_helper_, | 1044 mock_browsing_data_quota_helper_, |
1033 mock_browsing_data_server_bound_cert_helper_, | 1045 mock_browsing_data_server_bound_cert_helper_, |
| 1046 special_storage_policy_, |
1034 false); | 1047 false); |
1035 mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1"); | 1048 mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1"); |
1036 mock_browsing_data_cookie_helper_->Notify(); | 1049 mock_browsing_data_cookie_helper_->Notify(); |
1037 | 1050 |
1038 TestingProfile profile; | 1051 TestingProfile profile; |
1039 HostContentSettingsMap* content_settings = | 1052 HostContentSettingsMap* content_settings = |
1040 profile.GetHostContentSettingsMap(); | 1053 profile.GetHostContentSettingsMap(); |
1041 CookieSettings* cookie_settings = | 1054 CookieSettings* cookie_settings = |
1042 CookieSettings::Factory::GetForProfile(&profile); | 1055 CookieSettings::Factory::GetForProfile(&profile); |
1043 MockSettingsObserver observer; | 1056 MockSettingsObserver observer; |
1044 | 1057 |
1045 CookieTreeRootNode* root = | 1058 CookieTreeRootNode* root = |
1046 static_cast<CookieTreeRootNode*>(cookies_model.GetRoot()); | 1059 static_cast<CookieTreeRootNode*>(cookies_model.GetRoot()); |
1047 CookieTreeOriginNode* origin = root->GetOrCreateOriginNode(host); | 1060 CookieTreeHostNode* origin = root->GetOrCreateHostNode(host); |
1048 | 1061 |
1049 EXPECT_EQ(1, origin->child_count()); | 1062 EXPECT_EQ(1, origin->child_count()); |
1050 EXPECT_TRUE(origin->CanCreateContentException()); | 1063 EXPECT_TRUE(origin->CanCreateContentException()); |
1051 EXPECT_CALL(observer, | 1064 EXPECT_CALL(observer, |
1052 OnContentSettingsChanged( | 1065 OnContentSettingsChanged( |
1053 content_settings, | 1066 content_settings, |
1054 CONTENT_SETTINGS_TYPE_COOKIES, | 1067 CONTENT_SETTINGS_TYPE_COOKIES, |
1055 false, | 1068 false, |
1056 ContentSettingsPattern::FromURLNoWildcard(host), | 1069 ContentSettingsPattern::FromURLNoWildcard(host), |
1057 ContentSettingsPattern::Wildcard(), | 1070 ContentSettingsPattern::Wildcard(), |
1058 false)); | 1071 false)); |
1059 EXPECT_CALL(observer, | 1072 EXPECT_CALL(observer, |
1060 OnContentSettingsChanged(content_settings, | 1073 OnContentSettingsChanged(content_settings, |
1061 CONTENT_SETTINGS_TYPE_COOKIES, | 1074 CONTENT_SETTINGS_TYPE_COOKIES, |
1062 false, | 1075 false, |
1063 ContentSettingsPattern::FromURL(host), | 1076 ContentSettingsPattern::FromURL(host), |
1064 ContentSettingsPattern::Wildcard(), | 1077 ContentSettingsPattern::Wildcard(), |
1065 false)); | 1078 false)); |
1066 origin->CreateContentException( | 1079 origin->CreateContentException( |
1067 cookie_settings, CONTENT_SETTING_SESSION_ONLY); | 1080 cookie_settings, CONTENT_SETTING_SESSION_ONLY); |
1068 EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(host, host)); | 1081 EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(host, host)); |
1069 EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(host)); | 1082 EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(host)); |
1070 } | 1083 } |
1071 | 1084 |
1072 TEST_F(CookiesTreeModelTest, FileSystemFilter) { | 1085 TEST_F(CookiesTreeModelTest, FileSystemFilter) { |
1073 scoped_ptr<CookiesTreeModel> cookies_model( | 1086 scoped_ptr<CookiesTreeModel> cookies_model( |
1074 CreateCookiesTreeModelWithInitialSample()); | 1087 CreateCookiesTreeModelWithInitialSample()); |
1075 | 1088 |
1076 cookies_model->UpdateSearchResults(std::wstring(L"fshost1")); | 1089 cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost1")); |
1077 EXPECT_EQ("http://fshost1:1/", | 1090 EXPECT_EQ("http://fshost1:1/", |
1078 GetDisplayedFileSystems(cookies_model.get())); | 1091 GetDisplayedFileSystems(cookies_model.get())); |
1079 | 1092 |
1080 cookies_model->UpdateSearchResults(std::wstring(L"fshost2")); | 1093 cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost2")); |
1081 EXPECT_EQ("http://fshost2:2/", | 1094 EXPECT_EQ("http://fshost2:2/", |
1082 GetDisplayedFileSystems(cookies_model.get())); | 1095 GetDisplayedFileSystems(cookies_model.get())); |
1083 | 1096 |
1084 cookies_model->UpdateSearchResults(std::wstring(L"fshost3")); | 1097 cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost3")); |
1085 EXPECT_EQ("http://fshost3:3/", | 1098 EXPECT_EQ("http://fshost3:3/", |
1086 GetDisplayedFileSystems(cookies_model.get())); | 1099 GetDisplayedFileSystems(cookies_model.get())); |
1087 | 1100 |
1088 cookies_model->UpdateSearchResults(std::wstring()); | 1101 cookies_model->UpdateSearchResults(string16()); |
1089 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", | 1102 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", |
1090 GetDisplayedFileSystems(cookies_model.get())); | 1103 GetDisplayedFileSystems(cookies_model.get())); |
1091 } | 1104 } |
1092 | 1105 |
1093 } // namespace | 1106 } // namespace |
OLD | NEW |