Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

chrome/browser/browsing_data/browsing_data_remover_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include <stddef.h>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/run_loop.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/browsing_data_remover_test_util.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/origin_filter_builder.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/browsing_data/browsing_data_utils.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/download_test_observer.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/transport_security_state.h"
@@ skipping 52 matching lines @@
 
     GURL download_url = ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("downloads"),
         base::FilePath().AppendASCII("a_zip_file.zip"));
     ui_test_utils::NavigateToURL(browser(), download_url);
     observer->WaitForFinished();
 
     VerifyDownloadCount(1u);
   }
 
-  BrowsingDataCounter::ResultInt GetCacheSize() {
+  browsing_data::BrowsingDataCounter::ResultInt GetCacheSize() {
     base::RunLoop run_loop;
-    BrowsingDataCounter::ResultInt size;
+    browsing_data::BrowsingDataCounter::ResultInt size;
 
-    CacheCounter counter;
-    counter.Init(browser()->profile(),
+    Profile* profile = browser()->profile();
+    CacheCounter counter(profile);
+    counter.Init(profile->GetPrefs(),
                  base::Bind(&BrowsingDataRemoverBrowserTest::OnCacheSizeResult,
-                            base::Unretained(this),
-                            base::Unretained(&run_loop),
+                            base::Unretained(this), base::Unretained(&run_loop),
                             base::Unretained(&size)));
     counter.Restart();
     run_loop.Run();
     return size;
   }
 
   void RemoveAndWait(int remove_mask) {
     BrowsingDataRemover* remover =
         BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile());
     BrowsingDataRemoverCompletionObserver completion_observer(remover);
-    remover->Remove(BrowsingDataRemover::Period(BrowsingDataRemover::LAST_HOUR),
+    remover->Remove(BrowsingDataRemover::Period(browsing_data::LAST_HOUR),
                     remove_mask, BrowsingDataHelper::UNPROTECTED_WEB);
     completion_observer.BlockUntilCompletion();
   }
 
   void RemoveWithFilterAndWait(
       int remove_mask,
       const BrowsingDataFilterBuilder& filter_builder) {
     BrowsingDataRemover* remover =
         BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile());
     BrowsingDataRemoverCompletionObserver completion_observer(remover);
     remover->RemoveWithFilter(
-        BrowsingDataRemover::Period(BrowsingDataRemover::LAST_HOUR),
-        remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, filter_builder);
+        BrowsingDataRemover::Period(browsing_data::LAST_HOUR), remove_mask,
+        BrowsingDataHelper::UNPROTECTED_WEB, filter_builder);
     completion_observer.BlockUntilCompletion();
   }
 
  private:
   void OnCacheSizeResult(
       base::RunLoop* run_loop,
-      BrowsingDataCounter::ResultInt* out_size,
-      std::unique_ptr<BrowsingDataCounter::Result> result) {
+      browsing_data::BrowsingDataCounter::ResultInt* out_size,
+      std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
     if (!result->Finished())
       return;
 
-    *out_size = static_cast<BrowsingDataCounter::FinishedResult*>(
-        result.get())->Value();
+    *out_size =
+        static_cast<browsing_data::BrowsingDataCounter::FinishedResult*>(
+            result.get())
+            ->Value();
     run_loop->Quit();
   }
 };
 
 class BrowsingDataRemoverTransportSecurityStateBrowserTest
     : public BrowsingDataRemoverBrowserTest {
  public:
   BrowsingDataRemoverTransportSecurityStateBrowserTest() {}
 
   void SetUpOnMainThread() override {
@@ skipping 76 matching lines @@
 // in ConditionalCacheDeletionHelperBrowsertest.
 IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Cache) {
   // Load several resources.
   GURL url1 = embedded_test_server()->GetURL("/simple.html");
   GURL url2 = embedded_test_server()->GetURL(kExampleHost, "/simple.html");
   ASSERT_FALSE(url::IsSameOriginWith(url1, url2));
   ui_test_utils::NavigateToURL(browser(), url1);
   ui_test_utils::NavigateToURL(browser(), url2);
 
   // The cache is nonempty, because we created entries by visiting websites.
-  BrowsingDataCounter::ResultInt original_size = GetCacheSize();
+  browsing_data::BrowsingDataCounter::ResultInt original_size = GetCacheSize();
   EXPECT_GT(original_size, 0);
 
   // Partially delete cache data. Delete data for localhost, which is the origin
   // of |url1|, but not for |kExampleHost|, which is the origin of |url2|.
   OriginFilterBuilder filter_builder(OriginFilterBuilder::WHITELIST);
   filter_builder.AddOrigin(url::Origin(url1));
   RemoveWithFilterAndWait(BrowsingDataRemover::REMOVE_CACHE, filter_builder);
 
   // After the partial deletion, the cache should be smaller but still nonempty.
-  BrowsingDataCounter::ResultInt new_size = GetCacheSize();
+  browsing_data::BrowsingDataCounter::ResultInt new_size = GetCacheSize();
   EXPECT_LT(new_size, original_size);
 
   // Another partial deletion with the same filter should have no effect.
   RemoveWithFilterAndWait(BrowsingDataRemover::REMOVE_CACHE, filter_builder);
   EXPECT_EQ(new_size, GetCacheSize());
 
   // Delete the remaining data.
   RemoveAndWait(BrowsingDataRemover::REMOVE_CACHE);
 
   // The cache is empty.
@@ skipping 23 matching lines @@
   base::RunLoop run_loop;
   BrowserThread::PostTaskAndReply(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BrowsingDataRemoverTransportSecurityStateBrowserTest::
                      CheckTransportSecurityState,
                  this,
                  base::RetainedRef(browser()->profile()->GetRequestContext()),
                  false /* should not be cleared */),
       run_loop.QuitClosure());
 }