Index: chrome/browser/net/errorpage_browsertest.cc |
diff --git a/chrome/browser/net/errorpage_browsertest.cc b/chrome/browser/net/errorpage_browsertest.cc |
index 7b7b29931cfcf2ab279c513d830e4e2b1a2bd653..ec51d3b1ded05c9639c70786e92773b655c769e9 100644 |
--- a/chrome/browser/net/errorpage_browsertest.cc |
+++ b/chrome/browser/net/errorpage_browsertest.cc |
@@ -21,8 +21,7 @@ |
#include "base/values.h" |
#include "build/build_config.h" |
#include "chrome/browser/browsing_data/browsing_data_helper.h" |
-#include "chrome/browser/browsing_data/browsing_data_remover.h" |
-#include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
+ |
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
#include "chrome/browser/net/net_error_diagnostics_dialog.h" |
#include "chrome/browser/net/url_request_mock_util.h" |
@@ -45,6 +44,7 @@ |
#include "components/prefs/pref_service.h" |
#include "components/strings/grit/components_strings.h" |
#include "content/public/browser/browser_thread.h" |
+#include "content/public/browser/browsing_data_remover.h" |
#include "content/public/browser/navigation_handle.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_types.h" |
@@ -1007,11 +1007,11 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, StaleCacheStatus) { |
// Clear the cache and reload the same URL; confirm the error page is told |
// that there is no cached copy. |
- BrowsingDataRemover* remover = |
- BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile()); |
+ content::BrowsingDataRemover* remover = |
+ content::BrowserContext::GetBrowsingDataRemover(browser()->profile()); |
remover->Remove(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::DATA_TYPE_CACHE, |
- BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB); |
+ content::BrowsingDataRemover::DATA_TYPE_CACHE, |
+ content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB); |
ui_test_utils::NavigateToURL(browser(), test_url); |
EXPECT_TRUE(ProbeStaleCopyValue(false)); |
EXPECT_FALSE(IsDisplayingText(browser(), GetShowSavedButtonLabel())); |
@@ -1279,11 +1279,11 @@ IN_PROC_BROWSER_TEST_F(ErrorPageNavigationCorrectionsFailTest, |
// Clear the cache and reload the same URL; confirm the error page is told |
// that there is no cached copy. |
- BrowsingDataRemover* remover = |
- BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile()); |
+ content::BrowsingDataRemover* remover = |
+ content::BrowserContext::GetBrowsingDataRemover(browser()->profile()); |
remover->Remove(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::DATA_TYPE_CACHE, |
- BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB); |
+ content::BrowsingDataRemover::DATA_TYPE_CACHE, |
+ content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB); |
ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( |
browser(), test_url, 2); |
EXPECT_TRUE(ProbeStaleCopyValue(false)); |