Move StoragePartitionHttpCacheDataRemover to content/

chrome/browser/browsing_data/cache_counter_browsertest.cc

Index: chrome/browser/browsing_data/cache_counter_browsertest.cc
diff --git a/chrome/browser/browsing_data/cache_counter_browsertest.cc b/chrome/browser/browsing_data/cache_counter_browsertest.cc
index 29fca8394779e5945711a56034f83be99b2af62d..2ac1e74ba73ebadcf0ca60dd5f53768855d12be0 100644
--- a/chrome/browser/browsing_data/cache_counter_browsertest.cc
+++ b/chrome/browser/browsing_data/cache_counter_browsertest.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/browsing_data/content/storage_partition_http_cache_data_remover.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/prefs/pref_service.h"
@@ -217,12 +216,10 @@ IN_PROC_BROWSER_TEST_F(CacheCounterTest, AfterDoom) {
       profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
       base::Bind(&CacheCounterTest::CountingCallback, base::Unretained(this)));
 
-  browsing_data::StoragePartitionHttpCacheDataRemover::CreateForRange(
-      content::BrowserContext::GetDefaultStoragePartition(browser()->profile()),
-      base::Time(),
-      base::Time::Max())->Remove(
-          base::Bind(&CacheCounter::Restart,
-          base::Unretained(&counter)));
+  content::BrowserContext::GetDefaultStoragePartition(browser()->profile())
+      ->ClearHttpAndMediaCaches(
+          base::Time(), base::Time::Max(), base::Callback<bool(const GURL&)>(),
+          base::Bind(&CacheCounter::Restart, base::Unretained(&counter)));
 
   WaitForIOThread();
   EXPECT_EQ(0u, GetResult());