Index: chrome/browser/net/sdch_browsertest.cc |
diff --git a/chrome/browser/net/sdch_browsertest.cc b/chrome/browser/net/sdch_browsertest.cc |
index 0966cc4e5c467a77336d63cd913742fdaeff08f0..1fa531831d5b8f801fa6447810be0ffbacc554d8 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_remover_delegate.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/browser.h" |
@@ -413,7 +414,8 @@ class SdchBrowserTest : public InProcessBrowserTest, |
browsing_data::TimePeriod::LAST_HOUR), |
browsing_data::CalculateEndDeleteTime( |
browsing_data::TimePeriod::LAST_HOUR), |
- remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, |
+ remove_mask, |
+ BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, |
&completion_observer); |
completion_observer.BlockUntilCompletion(); |
} |
@@ -676,14 +678,14 @@ 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); |
+ BrowsingDataRemoveAndWait(ChromeBrowsingDataRemoverDelegate::ALL_DATA_TYPES & |
+ ~BrowsingDataRemover::DATA_TYPE_CACHE); |
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(BrowsingDataRemover::DATA_TYPE_CACHE); |
sdch_encoding_used = false; |
ASSERT_TRUE(GetData(&sdch_encoding_used)); |
EXPECT_FALSE(sdch_encoding_used); |