Move StoragePartitionHttpCacheDataRemover to content/

chrome/browser/browsing_data/cache_counter_browsertest.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Note that this file only tests the basic behavior of the cache counter, as in
 // when it counts and when not, when result is nonzero and when not. It does not
 // test whether the result of the counting is correct. This is the
 // responsibility of a lower layer, and is tested in
 // DiskCacheBackendTest.CalculateSizeOfAllEntries in net_unittests.
 
 #include "chrome/browser/browsing_data/cache_counter.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 #include "content/public/browser/storage_partition.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserContext;
@@ skipping 181 matching lines @@
 // Tests that after dooming a nonempty cache, the result is zero.
 IN_PROC_BROWSER_TEST_F(CacheCounterTest, AfterDoom) {
   CreateCacheEntry();
 
   Profile* profile = browser()->profile();
   CacheCounter counter(profile);
   counter.Init(
       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());
 }
 
 // Tests that the counter starts counting automatically when the deletion
 // pref changes to true.
 IN_PROC_BROWSER_TEST_F(CacheCounterTest, PrefChanged) {
   SetCacheDeletionPref(false);
 
@@ skipping 34 matching lines @@
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 
   SetDeletionPeriodPref(browsing_data::TimePeriod::ALL_TIME);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
   EXPECT_FALSE(IsUpperLimit());
 }
 
 }  // namespace