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

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

Issue 428323002: ifdef remaining extensions code in chrome/browser/browsing_data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang again Created 6 years, 4 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 | Annotate | Revision Log
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 "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h" 12 #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
12 #include "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h" 13 #include "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h"
13 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h" 14 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
14 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h" 15 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
15 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h" 16 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h"
16 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h" 17 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h"
17 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h" 18 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h"
18 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h " 19 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h "
19 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h" 20 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
20 #include "chrome/browser/content_settings/cookie_settings.h" 21 #include "chrome/browser/content_settings/cookie_settings.h"
21 #include "chrome/browser/content_settings/host_content_settings_map.h" 22 #include "chrome/browser/content_settings/host_content_settings_map.h"
22 #include "chrome/browser/content_settings/mock_settings_observer.h" 23 #include "chrome/browser/content_settings/mock_settings_observer.h"
23 #include "chrome/browser/extensions/extension_special_storage_policy.h"
24 #include "chrome/test/base/testing_profile.h" 24 #include "chrome/test/base/testing_profile.h"
25 #include "content/public/browser/notification_details.h" 25 #include "content/public/browser/notification_details.h"
26 #include "content/public/browser/notification_types.h" 26 #include "content/public/browser/notification_types.h"
27 #include "content/public/test/test_browser_thread_bundle.h" 27 #include "content/public/test/test_browser_thread_bundle.h"
28 #include "net/url_request/url_request_context.h" 28 #include "net/url_request/url_request_context.h"
29 #include "net/url_request/url_request_context_getter.h" 29 #include "net/url_request/url_request_context_getter.h"
30 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
31 31
32 #include "base/strings/utf_string_conversions.h" 32 #if defined(ENABLE_EXTENSIONS)
33 #include "chrome/browser/extensions/extension_special_storage_policy.h"
34 #endif
33 35
34 using ::testing::_; 36 using ::testing::_;
35 using content::BrowserThread; 37 using content::BrowserThread;
36 38
37 namespace { 39 namespace {
38 40
39 class CookiesTreeModelTest : public testing::Test { 41 class CookiesTreeModelTest : public testing::Test {
40 public: 42 public:
41 virtual ~CookiesTreeModelTest() { 43 virtual ~CookiesTreeModelTest() {
42 // Avoid memory leaks. 44 // Avoid memory leaks.
45 #if defined(ENABLE_EXTENSIONS)
43 special_storage_policy_ = NULL; 46 special_storage_policy_ = NULL;
47 #endif
44 profile_.reset(); 48 profile_.reset();
45 base::MessageLoop::current()->RunUntilIdle(); 49 base::MessageLoop::current()->RunUntilIdle();
46 } 50 }
47 51
48 virtual void SetUp() OVERRIDE { 52 virtual void SetUp() OVERRIDE {
49 profile_.reset(new TestingProfile()); 53 profile_.reset(new TestingProfile());
50 mock_browsing_data_cookie_helper_ = 54 mock_browsing_data_cookie_helper_ =
51 new MockBrowsingDataCookieHelper(profile_->GetRequestContext()); 55 new MockBrowsingDataCookieHelper(profile_->GetRequestContext());
52 mock_browsing_data_database_helper_ = 56 mock_browsing_data_database_helper_ =
53 new MockBrowsingDataDatabaseHelper(profile_.get()); 57 new MockBrowsingDataDatabaseHelper(profile_.get());
(...skipping 10 matching lines...) Expand all
64 mock_browsing_data_quota_helper_ = 68 mock_browsing_data_quota_helper_ =
65 new MockBrowsingDataQuotaHelper(profile_.get()); 69 new MockBrowsingDataQuotaHelper(profile_.get());
66 mock_browsing_data_channel_id_helper_ = 70 mock_browsing_data_channel_id_helper_ =
67 new MockBrowsingDataChannelIDHelper(); 71 new MockBrowsingDataChannelIDHelper();
68 mock_browsing_data_flash_lso_helper_ = 72 mock_browsing_data_flash_lso_helper_ =
69 new MockBrowsingDataFlashLSOHelper(profile_.get()); 73 new MockBrowsingDataFlashLSOHelper(profile_.get());
70 74
71 scoped_refptr<CookieSettings> cookie_settings = 75 scoped_refptr<CookieSettings> cookie_settings =
72 new CookieSettings(profile_->GetHostContentSettingsMap(), 76 new CookieSettings(profile_->GetHostContentSettingsMap(),
73 profile_->GetPrefs()); 77 profile_->GetPrefs());
78 #if defined(ENABLE_EXTENSIONS)
74 special_storage_policy_ = 79 special_storage_policy_ =
75 new ExtensionSpecialStoragePolicy(cookie_settings.get()); 80 new ExtensionSpecialStoragePolicy(cookie_settings.get());
81 #endif
76 } 82 }
77 83
78 virtual void TearDown() OVERRIDE { 84 virtual void TearDown() OVERRIDE {
79 mock_browsing_data_channel_id_helper_ = NULL; 85 mock_browsing_data_channel_id_helper_ = NULL;
80 mock_browsing_data_quota_helper_ = NULL; 86 mock_browsing_data_quota_helper_ = NULL;
81 mock_browsing_data_file_system_helper_ = NULL; 87 mock_browsing_data_file_system_helper_ = NULL;
82 mock_browsing_data_indexed_db_helper_ = NULL; 88 mock_browsing_data_indexed_db_helper_ = NULL;
83 mock_browsing_data_appcache_helper_ = NULL; 89 mock_browsing_data_appcache_helper_ = NULL;
84 mock_browsing_data_session_storage_helper_ = NULL; 90 mock_browsing_data_session_storage_helper_ = NULL;
85 mock_browsing_data_local_storage_helper_ = NULL; 91 mock_browsing_data_local_storage_helper_ = NULL;
86 mock_browsing_data_database_helper_ = NULL; 92 mock_browsing_data_database_helper_ = NULL;
87 mock_browsing_data_flash_lso_helper_ = NULL; 93 mock_browsing_data_flash_lso_helper_ = NULL;
88 base::MessageLoop::current()->RunUntilIdle(); 94 base::MessageLoop::current()->RunUntilIdle();
89 } 95 }
90 96
91 scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() { 97 scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() {
92 LocalDataContainer* container = new LocalDataContainer( 98 LocalDataContainer* container = new LocalDataContainer(
93 mock_browsing_data_cookie_helper_.get(), 99 mock_browsing_data_cookie_helper_.get(),
94 mock_browsing_data_database_helper_.get(), 100 mock_browsing_data_database_helper_.get(),
95 mock_browsing_data_local_storage_helper_.get(), 101 mock_browsing_data_local_storage_helper_.get(),
96 mock_browsing_data_session_storage_helper_.get(), 102 mock_browsing_data_session_storage_helper_.get(),
97 mock_browsing_data_appcache_helper_.get(), 103 mock_browsing_data_appcache_helper_.get(),
98 mock_browsing_data_indexed_db_helper_.get(), 104 mock_browsing_data_indexed_db_helper_.get(),
99 mock_browsing_data_file_system_helper_.get(), 105 mock_browsing_data_file_system_helper_.get(),
100 mock_browsing_data_quota_helper_.get(), 106 mock_browsing_data_quota_helper_.get(),
101 mock_browsing_data_channel_id_helper_.get(), 107 mock_browsing_data_channel_id_helper_.get(),
102 mock_browsing_data_flash_lso_helper_.get()); 108 mock_browsing_data_flash_lso_helper_.get());
103 109
104 CookiesTreeModel* cookies_model = 110 CookiesTreeModel* cookies_model =
105 new CookiesTreeModel(container, special_storage_policy_.get(), false); 111 new CookiesTreeModel(container, special_storage_policy(), false);
106 mock_browsing_data_cookie_helper_-> 112 mock_browsing_data_cookie_helper_->
107 AddCookieSamples(GURL("http://foo1"), "A=1"); 113 AddCookieSamples(GURL("http://foo1"), "A=1");
108 mock_browsing_data_cookie_helper_-> 114 mock_browsing_data_cookie_helper_->
109 AddCookieSamples(GURL("http://foo2"), "B=1"); 115 AddCookieSamples(GURL("http://foo2"), "B=1");
110 mock_browsing_data_cookie_helper_-> 116 mock_browsing_data_cookie_helper_->
111 AddCookieSamples(GURL("http://foo3"), "C=1"); 117 AddCookieSamples(GURL("http://foo3"), "C=1");
112 mock_browsing_data_cookie_helper_->Notify(); 118 mock_browsing_data_cookie_helper_->Notify();
113 mock_browsing_data_database_helper_->AddDatabaseSamples(); 119 mock_browsing_data_database_helper_->AddDatabaseSamples();
114 mock_browsing_data_database_helper_->Notify(); 120 mock_browsing_data_database_helper_->Notify();
115 mock_browsing_data_local_storage_helper_->AddLocalStorageSamples(); 121 mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 retval += GetNodesOfChildren(node->GetChild(i), node_type); 190 retval += GetNodesOfChildren(node->GetChild(i), node_type);
185 } 191 }
186 return retval; 192 return retval;
187 } 193 }
188 194
189 if (node->GetDetailedInfo().node_type != node_type) 195 if (node->GetDetailedInfo().node_type != node_type)
190 return std::string(); 196 return std::string();
191 197
192 switch (node_type) { 198 switch (node_type) {
193 case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE: 199 case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE:
194 return node->GetDetailedInfo(). 200 return node->GetDetailedInfo().session_storage_info->origin_url.spec() +
195 session_storage_info->origin_url.spec() + ","; 201 ",";
196 case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: 202 case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE:
197 return node->GetDetailedInfo(). 203 return node->GetDetailedInfo().local_storage_info->origin_url.spec() +
198 local_storage_info->origin_url.spec() + ","; 204 ",";
199 case CookieTreeNode::DetailedInfo::TYPE_DATABASE: 205 case CookieTreeNode::DetailedInfo::TYPE_DATABASE:
200 return node->GetDetailedInfo().database_info->database_name + ","; 206 return node->GetDetailedInfo().database_info->database_name + ",";
201 case CookieTreeNode::DetailedInfo::TYPE_COOKIE: 207 case CookieTreeNode::DetailedInfo::TYPE_COOKIE:
202 return node->GetDetailedInfo().cookie->Name() + ","; 208 return node->GetDetailedInfo().cookie->Name() + ",";
203 case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: 209 case CookieTreeNode::DetailedInfo::TYPE_APPCACHE:
204 return node->GetDetailedInfo().appcache_info->manifest_url.spec() + 210 return node->GetDetailedInfo().appcache_info->manifest_url.spec() +
205 ","; 211 ",";
206 case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: 212 case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB:
207 return node->GetDetailedInfo().indexed_db_info->origin_.spec() + 213 return node->GetDetailedInfo().indexed_db_info->origin_.spec() +
208 ","; 214 ",";
209 case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: 215 case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM:
210 return node->GetDetailedInfo().file_system_info->origin.spec() + 216 return node->GetDetailedInfo().file_system_info->origin.spec() +
211 ","; 217 ",";
212 case CookieTreeNode::DetailedInfo::TYPE_QUOTA: 218 case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
213 return node->GetDetailedInfo().quota_info->host + ","; 219 return node->GetDetailedInfo().quota_info->host + ",";
214 case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID: 220 case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID:
215 return node->GetDetailedInfo( 221 return node->GetDetailedInfo().channel_id->server_identifier() + ",";
216 ).channel_id->server_identifier() + ",";
217 case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO: 222 case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO:
218 return node->GetDetailedInfo().flash_lso_domain + ","; 223 return node->GetDetailedInfo().flash_lso_domain + ",";
219 default: 224 default:
220 return std::string(); 225 return std::string();
221 } 226 }
222 } 227 }
223 228
224 std::string GetCookiesOfChildren(const CookieTreeNode* node) { 229 std::string GetCookiesOfChildren(const CookieTreeNode* node) {
225 return GetNodesOfChildren(node, CookieTreeNode::DetailedInfo::TYPE_COOKIE); 230 return GetNodesOfChildren(node, CookieTreeNode::DetailedInfo::TYPE_COOKIE);
226 } 231 }
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 330
326 // Do not call on the root. 331 // Do not call on the root.
327 void DeleteStoredObjects(CookieTreeNode* node) { 332 void DeleteStoredObjects(CookieTreeNode* node) {
328 node->DeleteStoredObjects(); 333 node->DeleteStoredObjects();
329 CookieTreeNode* parent_node = node->parent(); 334 CookieTreeNode* parent_node = node->parent();
330 DCHECK(parent_node); 335 DCHECK(parent_node);
331 delete parent_node->GetModel()->Remove(parent_node, node); 336 delete parent_node->GetModel()->Remove(parent_node, node);
332 } 337 }
333 338
334 protected: 339 protected:
340 ExtensionSpecialStoragePolicy* special_storage_policy() {
341 #if defined(ENABLE_EXTENSIONS)
342 return special_storage_policy_.get();
343 #else
344 return NULL;
345 #endif
346 }
347
335 content::TestBrowserThreadBundle thread_bundle_; 348 content::TestBrowserThreadBundle thread_bundle_;
336 scoped_ptr<TestingProfile> profile_; 349 scoped_ptr<TestingProfile> profile_;
337 scoped_refptr<MockBrowsingDataCookieHelper> 350 scoped_refptr<MockBrowsingDataCookieHelper>
338 mock_browsing_data_cookie_helper_; 351 mock_browsing_data_cookie_helper_;
339 scoped_refptr<MockBrowsingDataDatabaseHelper> 352 scoped_refptr<MockBrowsingDataDatabaseHelper>
340 mock_browsing_data_database_helper_; 353 mock_browsing_data_database_helper_;
341 scoped_refptr<MockBrowsingDataLocalStorageHelper> 354 scoped_refptr<MockBrowsingDataLocalStorageHelper>
342 mock_browsing_data_local_storage_helper_; 355 mock_browsing_data_local_storage_helper_;
343 scoped_refptr<MockBrowsingDataLocalStorageHelper> 356 scoped_refptr<MockBrowsingDataLocalStorageHelper>
344 mock_browsing_data_session_storage_helper_; 357 mock_browsing_data_session_storage_helper_;
345 scoped_refptr<MockBrowsingDataAppCacheHelper> 358 scoped_refptr<MockBrowsingDataAppCacheHelper>
346 mock_browsing_data_appcache_helper_; 359 mock_browsing_data_appcache_helper_;
347 scoped_refptr<MockBrowsingDataIndexedDBHelper> 360 scoped_refptr<MockBrowsingDataIndexedDBHelper>
348 mock_browsing_data_indexed_db_helper_; 361 mock_browsing_data_indexed_db_helper_;
349 scoped_refptr<MockBrowsingDataFileSystemHelper> 362 scoped_refptr<MockBrowsingDataFileSystemHelper>
350 mock_browsing_data_file_system_helper_; 363 mock_browsing_data_file_system_helper_;
351 scoped_refptr<MockBrowsingDataQuotaHelper> 364 scoped_refptr<MockBrowsingDataQuotaHelper>
352 mock_browsing_data_quota_helper_; 365 mock_browsing_data_quota_helper_;
353 scoped_refptr<MockBrowsingDataChannelIDHelper> 366 scoped_refptr<MockBrowsingDataChannelIDHelper>
354 mock_browsing_data_channel_id_helper_; 367 mock_browsing_data_channel_id_helper_;
355 scoped_refptr<MockBrowsingDataFlashLSOHelper> 368 scoped_refptr<MockBrowsingDataFlashLSOHelper>
356 mock_browsing_data_flash_lso_helper_; 369 mock_browsing_data_flash_lso_helper_;
357 370
371 #if defined(ENABLE_EXTENSIONS)
358 scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_; 372 scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
373 #endif
359 }; 374 };
360 375
361 TEST_F(CookiesTreeModelTest, RemoveAll) { 376 TEST_F(CookiesTreeModelTest, RemoveAll) {
362 scoped_ptr<CookiesTreeModel> cookies_model( 377 scoped_ptr<CookiesTreeModel> cookies_model(
363 CreateCookiesTreeModelWithInitialSample()); 378 CreateCookiesTreeModelWithInitialSample());
364 379
365 // Reset the selection of the first row. 380 // Reset the selection of the first row.
366 { 381 {
367 SCOPED_TRACE("Before removing"); 382 SCOPED_TRACE("Before removing");
368 EXPECT_EQ("A,B,C", 383 EXPECT_EQ("A,B,C",
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(), 826 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
812 mock_browsing_data_database_helper_.get(), 827 mock_browsing_data_database_helper_.get(),
813 mock_browsing_data_local_storage_helper_.get(), 828 mock_browsing_data_local_storage_helper_.get(),
814 mock_browsing_data_session_storage_helper_.get(), 829 mock_browsing_data_session_storage_helper_.get(),
815 mock_browsing_data_appcache_helper_.get(), 830 mock_browsing_data_appcache_helper_.get(),
816 mock_browsing_data_indexed_db_helper_.get(), 831 mock_browsing_data_indexed_db_helper_.get(),
817 mock_browsing_data_file_system_helper_.get(), 832 mock_browsing_data_file_system_helper_.get(),
818 mock_browsing_data_quota_helper_.get(), 833 mock_browsing_data_quota_helper_.get(),
819 mock_browsing_data_channel_id_helper_.get(), 834 mock_browsing_data_channel_id_helper_.get(),
820 mock_browsing_data_flash_lso_helper_.get()); 835 mock_browsing_data_flash_lso_helper_.get());
821 CookiesTreeModel cookies_model( 836 CookiesTreeModel cookies_model(container, special_storage_policy(), false);
822 container, special_storage_policy_.get(), false);
823 837
824 mock_browsing_data_cookie_helper_-> 838 mock_browsing_data_cookie_helper_->
825 AddCookieSamples(GURL("http://foo1"), "A=1"); 839 AddCookieSamples(GURL("http://foo1"), "A=1");
826 mock_browsing_data_cookie_helper_-> 840 mock_browsing_data_cookie_helper_->
827 AddCookieSamples(GURL("http://foo2"), "B=1"); 841 AddCookieSamples(GURL("http://foo2"), "B=1");
828 mock_browsing_data_cookie_helper_-> 842 mock_browsing_data_cookie_helper_->
829 AddCookieSamples(GURL("http://foo3"), "C=1"); 843 AddCookieSamples(GURL("http://foo3"), "C=1");
830 mock_browsing_data_cookie_helper_-> 844 mock_browsing_data_cookie_helper_->
831 AddCookieSamples(GURL("http://foo3"), "D=1"); 845 AddCookieSamples(GURL("http://foo3"), "D=1");
832 mock_browsing_data_cookie_helper_->Notify(); 846 mock_browsing_data_cookie_helper_->Notify();
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(), 914 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
901 mock_browsing_data_database_helper_.get(), 915 mock_browsing_data_database_helper_.get(),
902 mock_browsing_data_local_storage_helper_.get(), 916 mock_browsing_data_local_storage_helper_.get(),
903 mock_browsing_data_session_storage_helper_.get(), 917 mock_browsing_data_session_storage_helper_.get(),
904 mock_browsing_data_appcache_helper_.get(), 918 mock_browsing_data_appcache_helper_.get(),
905 mock_browsing_data_indexed_db_helper_.get(), 919 mock_browsing_data_indexed_db_helper_.get(),
906 mock_browsing_data_file_system_helper_.get(), 920 mock_browsing_data_file_system_helper_.get(),
907 mock_browsing_data_quota_helper_.get(), 921 mock_browsing_data_quota_helper_.get(),
908 mock_browsing_data_channel_id_helper_.get(), 922 mock_browsing_data_channel_id_helper_.get(),
909 mock_browsing_data_flash_lso_helper_.get()); 923 mock_browsing_data_flash_lso_helper_.get());
910 CookiesTreeModel cookies_model( 924 CookiesTreeModel cookies_model(container, special_storage_policy(), false);
911 container, special_storage_policy_.get(), false);
912 925
913 mock_browsing_data_cookie_helper_-> 926 mock_browsing_data_cookie_helper_->
914 AddCookieSamples(GURL("http://foo1"), "A=1"); 927 AddCookieSamples(GURL("http://foo1"), "A=1");
915 mock_browsing_data_cookie_helper_-> 928 mock_browsing_data_cookie_helper_->
916 AddCookieSamples(GURL("http://foo2"), "B=1"); 929 AddCookieSamples(GURL("http://foo2"), "B=1");
917 mock_browsing_data_cookie_helper_-> 930 mock_browsing_data_cookie_helper_->
918 AddCookieSamples(GURL("http://foo3"), "C=1"); 931 AddCookieSamples(GURL("http://foo3"), "C=1");
919 mock_browsing_data_cookie_helper_-> 932 mock_browsing_data_cookie_helper_->
920 AddCookieSamples(GURL("http://foo3"), "D=1"); 933 AddCookieSamples(GURL("http://foo3"), "D=1");
921 mock_browsing_data_cookie_helper_-> 934 mock_browsing_data_cookie_helper_->
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(), 1005 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
993 mock_browsing_data_database_helper_.get(), 1006 mock_browsing_data_database_helper_.get(),
994 mock_browsing_data_local_storage_helper_.get(), 1007 mock_browsing_data_local_storage_helper_.get(),
995 mock_browsing_data_session_storage_helper_.get(), 1008 mock_browsing_data_session_storage_helper_.get(),
996 mock_browsing_data_appcache_helper_.get(), 1009 mock_browsing_data_appcache_helper_.get(),
997 mock_browsing_data_indexed_db_helper_.get(), 1010 mock_browsing_data_indexed_db_helper_.get(),
998 mock_browsing_data_file_system_helper_.get(), 1011 mock_browsing_data_file_system_helper_.get(),
999 mock_browsing_data_quota_helper_.get(), 1012 mock_browsing_data_quota_helper_.get(),
1000 mock_browsing_data_channel_id_helper_.get(), 1013 mock_browsing_data_channel_id_helper_.get(),
1001 mock_browsing_data_flash_lso_helper_.get()); 1014 mock_browsing_data_flash_lso_helper_.get());
1002 CookiesTreeModel cookies_model( 1015 CookiesTreeModel cookies_model(container, special_storage_policy(), false);
1003 container, special_storage_policy_.get(), false);
1004 1016
1005 mock_browsing_data_cookie_helper_-> 1017 mock_browsing_data_cookie_helper_->
1006 AddCookieSamples(GURL("http://foo1"), "A=1"); 1018 AddCookieSamples(GURL("http://foo1"), "A=1");
1007 mock_browsing_data_cookie_helper_-> 1019 mock_browsing_data_cookie_helper_->
1008 AddCookieSamples(GURL("http://foo2"), "B=1"); 1020 AddCookieSamples(GURL("http://foo2"), "B=1");
1009 mock_browsing_data_cookie_helper_-> 1021 mock_browsing_data_cookie_helper_->
1010 AddCookieSamples(GURL("http://foo3"), "C=1"); 1022 AddCookieSamples(GURL("http://foo3"), "C=1");
1011 mock_browsing_data_cookie_helper_-> 1023 mock_browsing_data_cookie_helper_->
1012 AddCookieSamples(GURL("http://foo3"), "D=1"); 1024 AddCookieSamples(GURL("http://foo3"), "D=1");
1013 mock_browsing_data_cookie_helper_-> 1025 mock_browsing_data_cookie_helper_->
(...skipping 21 matching lines...) Expand all
1035 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(), 1047 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
1036 mock_browsing_data_database_helper_.get(), 1048 mock_browsing_data_database_helper_.get(),
1037 mock_browsing_data_local_storage_helper_.get(), 1049 mock_browsing_data_local_storage_helper_.get(),
1038 mock_browsing_data_session_storage_helper_.get(), 1050 mock_browsing_data_session_storage_helper_.get(),
1039 mock_browsing_data_appcache_helper_.get(), 1051 mock_browsing_data_appcache_helper_.get(),
1040 mock_browsing_data_indexed_db_helper_.get(), 1052 mock_browsing_data_indexed_db_helper_.get(),
1041 mock_browsing_data_file_system_helper_.get(), 1053 mock_browsing_data_file_system_helper_.get(),
1042 mock_browsing_data_quota_helper_.get(), 1054 mock_browsing_data_quota_helper_.get(),
1043 mock_browsing_data_channel_id_helper_.get(), 1055 mock_browsing_data_channel_id_helper_.get(),
1044 mock_browsing_data_flash_lso_helper_.get()); 1056 mock_browsing_data_flash_lso_helper_.get());
1045 CookiesTreeModel cookies_model( 1057 CookiesTreeModel cookies_model(container, special_storage_policy(), false);
1046 container, special_storage_policy_.get(), false);
1047 1058
1048 mock_browsing_data_cookie_helper_-> 1059 mock_browsing_data_cookie_helper_->
1049 AddCookieSamples(GURL("http://a.foo2.com"), "A=1"); 1060 AddCookieSamples(GURL("http://a.foo2.com"), "A=1");
1050 mock_browsing_data_cookie_helper_-> 1061 mock_browsing_data_cookie_helper_->
1051 AddCookieSamples(GURL("http://foo2.com"), "B=1"); 1062 AddCookieSamples(GURL("http://foo2.com"), "B=1");
1052 mock_browsing_data_cookie_helper_-> 1063 mock_browsing_data_cookie_helper_->
1053 AddCookieSamples(GURL("http://b.foo1.com"), "C=1"); 1064 AddCookieSamples(GURL("http://b.foo1.com"), "C=1");
1054 // Leading dot on the foo4 1065 // Leading dot on the foo4
1055 mock_browsing_data_cookie_helper_->AddCookieSamples( 1066 mock_browsing_data_cookie_helper_->AddCookieSamples(
1056 GURL("http://foo4.com"), "D=1; domain=.foo4.com; path=/;"); 1067 GURL("http://foo4.com"), "D=1; domain=.foo4.com; path=/;");
(...skipping 26 matching lines...) Expand all
1083 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(), 1094 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
1084 mock_browsing_data_database_helper_.get(), 1095 mock_browsing_data_database_helper_.get(),
1085 mock_browsing_data_local_storage_helper_.get(), 1096 mock_browsing_data_local_storage_helper_.get(),
1086 mock_browsing_data_session_storage_helper_.get(), 1097 mock_browsing_data_session_storage_helper_.get(),
1087 mock_browsing_data_appcache_helper_.get(), 1098 mock_browsing_data_appcache_helper_.get(),
1088 mock_browsing_data_indexed_db_helper_.get(), 1099 mock_browsing_data_indexed_db_helper_.get(),
1089 mock_browsing_data_file_system_helper_.get(), 1100 mock_browsing_data_file_system_helper_.get(),
1090 mock_browsing_data_quota_helper_.get(), 1101 mock_browsing_data_quota_helper_.get(),
1091 mock_browsing_data_channel_id_helper_.get(), 1102 mock_browsing_data_channel_id_helper_.get(),
1092 mock_browsing_data_flash_lso_helper_.get()); 1103 mock_browsing_data_flash_lso_helper_.get());
1093 CookiesTreeModel cookies_model( 1104 CookiesTreeModel cookies_model(container, special_storage_policy(), false);
1094 container, special_storage_policy_.get(), false);
1095 1105
1096 mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1"); 1106 mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
1097 mock_browsing_data_cookie_helper_->Notify(); 1107 mock_browsing_data_cookie_helper_->Notify();
1098 1108
1099 TestingProfile profile; 1109 TestingProfile profile;
1100 HostContentSettingsMap* content_settings = 1110 HostContentSettingsMap* content_settings =
1101 profile.GetHostContentSettingsMap(); 1111 profile.GetHostContentSettingsMap();
1102 CookieSettings* cookie_settings = 1112 CookieSettings* cookie_settings =
1103 CookieSettings::Factory::GetForProfile(&profile).get(); 1113 CookieSettings::Factory::GetForProfile(&profile).get();
1104 MockSettingsObserver observer; 1114 MockSettingsObserver observer;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(), 1167 new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
1158 mock_browsing_data_database_helper_.get(), 1168 mock_browsing_data_database_helper_.get(),
1159 mock_browsing_data_local_storage_helper_.get(), 1169 mock_browsing_data_local_storage_helper_.get(),
1160 mock_browsing_data_session_storage_helper_.get(), 1170 mock_browsing_data_session_storage_helper_.get(),
1161 mock_browsing_data_appcache_helper_.get(), 1171 mock_browsing_data_appcache_helper_.get(),
1162 mock_browsing_data_indexed_db_helper_.get(), 1172 mock_browsing_data_indexed_db_helper_.get(),
1163 mock_browsing_data_file_system_helper_.get(), 1173 mock_browsing_data_file_system_helper_.get(),
1164 mock_browsing_data_quota_helper_.get(), 1174 mock_browsing_data_quota_helper_.get(),
1165 mock_browsing_data_channel_id_helper_.get(), 1175 mock_browsing_data_channel_id_helper_.get(),
1166 mock_browsing_data_flash_lso_helper_.get()); 1176 mock_browsing_data_flash_lso_helper_.get());
1167 CookiesTreeModel cookies_model( 1177 CookiesTreeModel cookies_model(container, special_storage_policy(), false);
1168 container, special_storage_policy_.get(), false);
1169 1178
1170 mock_browsing_data_cookie_helper_-> 1179 mock_browsing_data_cookie_helper_->
1171 AddCookieSamples(GURL("http://123.com"), "A=1"); 1180 AddCookieSamples(GURL("http://123.com"), "A=1");
1172 mock_browsing_data_cookie_helper_-> 1181 mock_browsing_data_cookie_helper_->
1173 AddCookieSamples(GURL("http://foo1.com"), "B=1"); 1182 AddCookieSamples(GURL("http://foo1.com"), "B=1");
1174 mock_browsing_data_cookie_helper_-> 1183 mock_browsing_data_cookie_helper_->
1175 AddCookieSamples(GURL("http://foo2.com"), "C=1"); 1184 AddCookieSamples(GURL("http://foo2.com"), "C=1");
1176 mock_browsing_data_cookie_helper_-> 1185 mock_browsing_data_cookie_helper_->
1177 AddCookieSamples(GURL("http://foo3.com"), "D=1"); 1186 AddCookieSamples(GURL("http://foo3.com"), "D=1");
1178 mock_browsing_data_cookie_helper_->Notify(); 1187 mock_browsing_data_cookie_helper_->Notify();
1179 EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model)); 1188 EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
1180 1189
1181 cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo"))); 1190 cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo")));
1182 EXPECT_EQ("B,C,D", GetDisplayedCookies(&cookies_model)); 1191 EXPECT_EQ("B,C,D", GetDisplayedCookies(&cookies_model));
1183 1192
1184 cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("2"))); 1193 cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("2")));
1185 EXPECT_EQ("A,C", GetDisplayedCookies(&cookies_model)); 1194 EXPECT_EQ("A,C", GetDisplayedCookies(&cookies_model));
1186 1195
1187 cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo3"))); 1196 cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo3")));
1188 EXPECT_EQ("D", GetDisplayedCookies(&cookies_model)); 1197 EXPECT_EQ("D", GetDisplayedCookies(&cookies_model));
1189 1198
1190 cookies_model.UpdateSearchResults(base::string16()); 1199 cookies_model.UpdateSearchResults(base::string16());
1191 EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model)); 1200 EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
1192 } 1201 }
1193 1202
1194 } // namespace 1203 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data/cookies_tree_model.cc ('k') | chrome/browser/ui/webui/cookies_tree_model_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698