| 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/browsing_data/browsing_data_remover.h" | 5 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/history/history_service_factory.h" | 24 #include "chrome/browser/history/history_service_factory.h" |
| 25 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 25 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 26 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
| 27 #include "chrome/test/base/testing_browser_process.h" | 27 #include "chrome/test/base/testing_browser_process.h" |
| 28 #include "chrome/test/base/testing_profile.h" | 28 #include "chrome/test/base/testing_profile.h" |
| 29 #include "components/autofill/core/browser/autofill_common_test.h" | 29 #include "components/autofill/core/browser/autofill_common_test.h" |
| 30 #include "components/autofill/core/browser/autofill_profile.h" | 30 #include "components/autofill/core/browser/autofill_profile.h" |
| 31 #include "components/autofill/core/browser/credit_card.h" | 31 #include "components/autofill/core/browser/credit_card.h" |
| 32 #include "components/autofill/core/browser/personal_data_manager.h" | 32 #include "components/autofill/core/browser/personal_data_manager.h" |
| 33 #include "components/autofill/core/browser/personal_data_manager_observer.h" | 33 #include "components/autofill/core/browser/personal_data_manager_observer.h" |
| 34 #include "content/public/browser/browser_context.h" |
| 35 #include "content/public/browser/cookie_store_map.h" |
| 34 #include "content/public/browser/dom_storage_context.h" | 36 #include "content/public/browser/dom_storage_context.h" |
| 35 #include "content/public/browser/notification_service.h" | 37 #include "content/public/browser/notification_service.h" |
| 36 #include "content/public/browser/storage_partition.h" | 38 #include "content/public/browser/storage_partition.h" |
| 37 #include "content/public/test/test_browser_thread.h" | 39 #include "content/public/common/url_constants.h" |
| 38 #include "content/public/test/test_browser_thread_bundle.h" | 40 #include "content/public/test/test_browser_thread_bundle.h" |
| 39 #include "net/cookies/cookie_monster.h" | 41 #include "net/cookies/cookie_monster.h" |
| 40 #include "net/ssl/server_bound_cert_service.h" | 42 #include "net/ssl/server_bound_cert_service.h" |
| 41 #include "net/ssl/server_bound_cert_store.h" | 43 #include "net/ssl/server_bound_cert_store.h" |
| 42 #include "net/ssl/ssl_client_cert_type.h" | 44 #include "net/ssl/ssl_client_cert_type.h" |
| 43 #include "net/url_request/url_request_context.h" | 45 #include "net/url_request/url_request_context.h" |
| 44 #include "net/url_request/url_request_context_getter.h" | 46 #include "net/url_request/url_request_context_getter.h" |
| 45 #include "testing/gtest/include/gtest/gtest.h" | 47 #include "testing/gtest/include/gtest/gtest.h" |
| 46 #include "webkit/browser/quota/mock_quota_manager.h" | 48 #include "webkit/browser/quota/mock_quota_manager.h" |
| 47 #include "webkit/browser/quota/quota_manager.h" | 49 #include "webkit/browser/quota/quota_manager.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 bool get_cookie_success_; | 218 bool get_cookie_success_; |
| 217 AwaitCompletionHelper await_completion_; | 219 AwaitCompletionHelper await_completion_; |
| 218 net::CookieStore* monster_; | 220 net::CookieStore* monster_; |
| 219 | 221 |
| 220 DISALLOW_COPY_AND_ASSIGN(RemoveCookieTester); | 222 DISALLOW_COPY_AND_ASSIGN(RemoveCookieTester); |
| 221 }; | 223 }; |
| 222 | 224 |
| 223 class RemoveProfileCookieTester : public RemoveCookieTester { | 225 class RemoveProfileCookieTester : public RemoveCookieTester { |
| 224 public: | 226 public: |
| 225 explicit RemoveProfileCookieTester(TestingProfile* profile) { | 227 explicit RemoveProfileCookieTester(TestingProfile* profile) { |
| 226 SetMonster(profile->GetRequestContext()->GetURLRequestContext()-> | 228 content::StoragePartition* partition = |
| 227 cookie_store()->GetCookieMonster()); | 229 content::BrowserContext::GetDefaultStoragePartition(profile); |
| 230 SetMonster( |
| 231 partition->GetCookieStoreMap().GetForScheme(chrome::kHttpScheme)); |
| 228 } | 232 } |
| 229 }; | 233 }; |
| 230 | 234 |
| 231 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) | 235 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) |
| 232 class RemoveSafeBrowsingCookieTester : public RemoveCookieTester { | 236 class RemoveSafeBrowsingCookieTester : public RemoveCookieTester { |
| 233 public: | 237 public: |
| 234 RemoveSafeBrowsingCookieTester() | 238 RemoveSafeBrowsingCookieTester() |
| 235 : browser_process_(TestingBrowserProcess::GetGlobal()) { | 239 : browser_process_(TestingBrowserProcess::GetGlobal()) { |
| 236 scoped_refptr<SafeBrowsingService> sb_service = | 240 scoped_refptr<SafeBrowsingService> sb_service = |
| 237 SafeBrowsingService::CreateSafeBrowsingService(); | 241 SafeBrowsingService::CreateSafeBrowsingService(); |
| (...skipping 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1383 BlockUntilBrowsingDataRemoved( | 1387 BlockUntilBrowsingDataRemoved( |
| 1384 BrowsingDataRemover::LAST_HOUR, | 1388 BrowsingDataRemover::LAST_HOUR, |
| 1385 BrowsingDataRemover::REMOVE_HISTORY, false); | 1389 BrowsingDataRemover::REMOVE_HISTORY, false); |
| 1386 | 1390 |
| 1387 EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask()); | 1391 EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask()); |
| 1388 EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginSetMask()); | 1392 EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginSetMask()); |
| 1389 EXPECT_TRUE(tester.HasOrigin(std::string())); | 1393 EXPECT_TRUE(tester.HasOrigin(std::string())); |
| 1390 EXPECT_FALSE(tester.HasOrigin(kWebOrigin)); | 1394 EXPECT_FALSE(tester.HasOrigin(kWebOrigin)); |
| 1391 EXPECT_TRUE(tester.HasOrigin(kChromeOrigin)); | 1395 EXPECT_TRUE(tester.HasOrigin(kChromeOrigin)); |
| 1392 } | 1396 } |
| OLD | NEW |