Index: chrome/browser/browsing_data/browsing_data_remover_browsertest.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc |
index 69a1b303ce94188adc17a21c35ec4ccc596f49d6..15740d4720ce4911480be01a5e0877b135169e06 100644 |
--- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc |
+++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc |
@@ -15,6 +15,7 @@ |
#include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
#include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" |
#include "chrome/browser/browsing_data/cache_counter.h" |
+#include "chrome/browser/browsing_data/chrome_browsing_data_types.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/external_protocol/external_protocol_handler.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -42,6 +43,7 @@ |
using content::BrowserThread; |
using content::BrowsingDataFilterBuilder; |
+using content::BrowsingDataType; |
namespace { |
static const char* kExampleHost = "example.com"; |
@@ -113,7 +115,7 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest { |
return size; |
} |
- void RemoveAndWait(int remove_mask) { |
+ void RemoveAndWait(const std::set<const BrowsingDataType*>& remove_mask) { |
BrowsingDataRemover* remover = |
BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile()); |
BrowsingDataRemoverCompletionObserver completion_observer(remover); |
@@ -124,7 +126,7 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest { |
} |
void RemoveWithFilterAndWait( |
- int remove_mask, |
+ const std::set<const BrowsingDataType*>& remove_mask, |
std::unique_ptr<BrowsingDataFilterBuilder> filter_builder) { |
BrowsingDataRemover* remover = |
BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile()); |
@@ -193,7 +195,7 @@ class BrowsingDataRemoverTransportSecurityStateBrowserTest |
// Test BrowsingDataRemover for downloads. |
IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Download) { |
DownloadAnItem(); |
- RemoveAndWait(BrowsingDataRemover::REMOVE_DOWNLOADS); |
+ RemoveAndWait({&kBrowsingDataTypeDownloads}); |
VerifyDownloadCount(0u); |
} |
@@ -207,7 +209,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, DownloadProhibited) { |
prefs->SetBoolean(prefs::kAllowDeletingBrowserHistory, false); |
DownloadAnItem(); |
- RemoveAndWait(BrowsingDataRemover::REMOVE_DOWNLOADS); |
+ RemoveAndWait({&kBrowsingDataTypeDownloads}); |
VerifyDownloadCount(1u); |
} |
#endif |
@@ -222,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Database) { |
RunScriptAndCheckResult("insertRecord('text')", "done"); |
RunScriptAndCheckResult("getRecords()", "text"); |
- RemoveAndWait(BrowsingDataRemover::REMOVE_SITE_DATA); |
+ RemoveAndWait(BrowsingDataTypeSetSiteData()); |
ui_test_utils::NavigateToURL(browser(), url); |
RunScriptAndCheckResult("createTable()", "done"); |
@@ -253,8 +255,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Cache) { |
std::unique_ptr<BrowsingDataFilterBuilder> filter_builder = |
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST); |
filter_builder->AddOrigin(url::Origin(url1)); |
- RemoveWithFilterAndWait(BrowsingDataRemover::REMOVE_CACHE, |
- std::move(filter_builder)); |
+ RemoveWithFilterAndWait({&kBrowsingDataTypeCache}, std::move(filter_builder)); |
// After the partial deletion, the cache should be smaller but still nonempty. |
browsing_data::BrowsingDataCounter::ResultInt new_size = GetCacheSize(); |
@@ -264,12 +265,11 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Cache) { |
filter_builder = |
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST); |
filter_builder->AddOrigin(url::Origin(url1)); |
- RemoveWithFilterAndWait(BrowsingDataRemover::REMOVE_CACHE, |
- std::move(filter_builder)); |
+ RemoveWithFilterAndWait({&kBrowsingDataTypeCache}, std::move(filter_builder)); |
EXPECT_EQ(new_size, GetCacheSize()); |
// Delete the remaining data. |
- RemoveAndWait(BrowsingDataRemover::REMOVE_CACHE); |
+ RemoveAndWait({&kBrowsingDataTypeCache}); |
// The cache is empty. |
EXPECT_EQ(0, GetCacheSize()); |
@@ -284,15 +284,16 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, |
ExternalProtocolHandler::BlockState block_state = |
ExternalProtocolHandler::GetBlockState("tel", profile); |
ASSERT_EQ(ExternalProtocolHandler::BLOCK, block_state); |
- RemoveAndWait(BrowsingDataRemover::REMOVE_SITE_DATA); |
+ RemoveAndWait(BrowsingDataTypeSetSiteData()); |
block_state = ExternalProtocolHandler::GetBlockState("tel", profile); |
ASSERT_EQ(ExternalProtocolHandler::UNKNOWN, block_state); |
} |
-// Verify that TransportSecurityState data is cleared for REMOVE_CACHE. |
+// Verify that TransportSecurityState data is cleared |
+// for kBrowsingDataTypeCache. |
IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverTransportSecurityStateBrowserTest, |
ClearTransportSecurityState) { |
- RemoveAndWait(BrowsingDataRemover::REMOVE_CACHE); |
+ RemoveAndWait({&kBrowsingDataTypeCache}); |
base::RunLoop run_loop; |
BrowserThread::PostTaskAndReply( |
BrowserThread::IO, FROM_HERE, |
@@ -304,11 +305,11 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverTransportSecurityStateBrowserTest, |
run_loop.QuitClosure()); |
} |
-// Verify that TransportSecurityState data is not cleared if REMOVE_CACHE is not |
-// set. |
+// Verify that TransportSecurityState data is not cleared |
+// if kBrowsingDataTypeCache is not set. |
IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverTransportSecurityStateBrowserTest, |
PreserveTransportSecurityState) { |
- RemoveAndWait(BrowsingDataRemover::REMOVE_SITE_DATA); |
+ RemoveAndWait(BrowsingDataTypeSetSiteData()); |
base::RunLoop run_loop; |
BrowserThread::PostTaskAndReply( |
BrowserThread::IO, FROM_HERE, |