Index: chrome/browser/net/sdch_browsertest.cc |
diff --git a/chrome/browser/net/sdch_browsertest.cc b/chrome/browser/net/sdch_browsertest.cc |
index 257f7a7832b4172b7c994f280c5be6ac8a25b043..52e2bd3d52a58ab1a9402e416a30afce4b3fdc13 100644 |
--- a/chrome/browser/net/sdch_browsertest.cc |
+++ b/chrome/browser/net/sdch_browsertest.cc |
@@ -26,6 +26,7 @@ |
#include "chrome/browser/browsing_data/browsing_data_remover.h" |
#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/chrome_browsing_data_types.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/browser.h" |
@@ -405,7 +406,8 @@ class SdchBrowserTest : public InProcessBrowserTest, |
return fetches; |
} |
- void BrowsingDataRemoveAndWait(int remove_mask) { |
+ void BrowsingDataRemoveAndWait( |
+ const std::set<const content::BrowsingDataType*>& remove_mask) { |
BrowsingDataRemover* remover = |
BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile()); |
BrowsingDataRemoverCompletionObserver completion_observer(remover); |
@@ -674,14 +676,15 @@ IN_PROC_BROWSER_TEST_F(SdchBrowserTest, BrowsingDataRemover) { |
// Confirm browsing data remover without removing the cache leaves |
// SDCH alone. |
- BrowsingDataRemoveAndWait(BrowsingDataRemover::REMOVE_ALL & |
- ~BrowsingDataRemover::REMOVE_CACHE); |
+ std::set<const content::BrowsingDataType*> mask = BrowsingDataTypeSetAll(); |
+ mask.erase(&kBrowsingDataTypeCache); |
+ BrowsingDataRemoveAndWait(mask); |
bool sdch_encoding_used = false; |
ASSERT_TRUE(GetData(&sdch_encoding_used)); |
EXPECT_TRUE(sdch_encoding_used); |
// Confirm browsing data remover removing the cache clears SDCH state. |
- BrowsingDataRemoveAndWait(BrowsingDataRemover::REMOVE_CACHE); |
+ BrowsingDataRemoveAndWait({&kBrowsingDataTypeCache}); |
sdch_encoding_used = false; |
ASSERT_TRUE(GetData(&sdch_encoding_used)); |
EXPECT_FALSE(sdch_encoding_used); |