chrome/browser/browsing_data/cookies_tree_model_unittest.cc - Issue 2110483002: Remove use of CanonicalCookie::Source() from browsing_data.

Unified Diff: chrome/browser/browsing_data/cookies_tree_model_unittest.cc

Issue 2110483002: Remove use of CanonicalCookie::Source() from browsing_data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/browsing_data/cookies_tree_model.cc ('k') | chrome/browser/content_settings/local_shared_objects_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/cookies_tree_model_unittest.cc

diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc

index 117049093cfcdcd3e0a05d68d83fda7ead157de0..89a237a66fa903cebd2afa50bd0ee24cd31f3a8e 100644

--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc

+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc

@@ -125,7 +125,7 @@ class CookiesTreeModelTest : public testing::Test {

mock_browsing_data_flash_lso_helper_.get());

CookiesTreeModel* cookies_model =

- new CookiesTreeModel(container, special_storage_policy(), false);

+ new CookiesTreeModel(container, special_storage_policy());

mock_browsing_data_cookie_helper_->

AddCookieSamples(GURL("http://foo1"), "A=1");

mock_browsing_data_cookie_helper_->

@@ -1100,7 +1100,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(), false);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->

AddCookieSamples(GURL("http://foo1"), "A=1");

@@ -1207,7 +1207,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(), false);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->

AddCookieSamples(GURL("http://foo1"), "A=1");

@@ -1317,7 +1317,7 @@ TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(), false);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->

AddCookieSamples(GURL("http://foo1"), "A=1");

@@ -1361,7 +1361,7 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(), false);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->

AddCookieSamples(GURL("http://a.foo2.com"), "A=1");

@@ -1410,7 +1410,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(), false);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");

mock_browsing_data_cookie_helper_->Notify();

@@ -1515,7 +1515,7 @@ TEST_F(CookiesTreeModelTest, CookiesFilter) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(), false);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->

AddCookieSamples(GURL("http://123.com"), "A=1");

@@ -1557,8 +1557,7 @@ TEST_F(CookiesTreeModelTest, CanonicalizeCookieSource) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(),

- true /* group by cookie source */);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->AddCookieSamples(

GURL("file:///tmp/test.html"), "A=1");

@@ -1646,7 +1645,7 @@ TEST_F(CookiesTreeModelTest, CookiesFilterWithoutSource) {

mock_browsing_data_service_worker_helper_.get(),

mock_browsing_data_cache_storage_helper_.get(),

mock_browsing_data_flash_lso_helper_.get());

- CookiesTreeModel cookies_model(container, special_storage_policy(), false);

+ CookiesTreeModel cookies_model(container, special_storage_policy());

mock_browsing_data_cookie_helper_->

AddCookieSamples(GURL(), "A=1");