Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

chrome/browser/browsing_data/history_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.
 
 #include "chrome/browser/browsing_data/history_counter.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/browsing_data/browsing_data_utils.h"
+#include "components/browsing_data/pref_names.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/web_history_service.h"
 #include "components/history/core/test/fake_web_history_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "net/http/http_status_code.h"
 #include "url/gurl.h"
 
 namespace {
 
 class HistoryCounterTest : public SyncTest {
  public:
   HistoryCounterTest() : SyncTest(SINGLE_CLIENT) {
     // TODO(msramek): Only one of the test cases, RestartOnSyncChange, is a Sync
     // integration test. Extract it and move it to the rest of integration tests
     // in chrome/browser/sync/test/integration/. Change this class back to
     // InProcessBrowserTest.
   }
 
   ~HistoryCounterTest() override {};
 
   void SetUpOnMainThread() override {
     time_ = base::Time::Now();
     service_ = HistoryServiceFactory::GetForProfileWithoutCreating(
         browser()->profile());
     SetHistoryDeletionPref(true);
-    SetDeletionPeriodPref(BrowsingDataRemover::EVERYTHING);
+    SetDeletionPeriodPref(browsing_data::EVERYTHING);
   }
 
   void AddVisit(const std::string url) {
     service_->AddPage(GURL(url), time_, history::SOURCE_BROWSED);
   }
 
   const base::Time& GetCurrentTime() {
     return time_;
   }
 
   void RevertTimeInDays(int days) {
     time_ -= base::TimeDelta::FromDays(days);
   }
 
   void SetHistoryDeletionPref(bool value) {
     browser()->profile()->GetPrefs()->SetBoolean(
         prefs::kDeleteBrowsingHistory, value);
   }
 
-  void SetDeletionPeriodPref(BrowsingDataRemover::TimePeriod period) {
+  void SetDeletionPeriodPref(browsing_data::TimePeriod period) {
     browser()->profile()->GetPrefs()->SetInteger(
-        prefs::kDeleteTimePeriod, static_cast<int>(period));
+        browsing_data::prefs::kDeleteTimePeriod, static_cast<int>(period));
   }
 
   void WaitForCounting() {
     run_loop_.reset(new base::RunLoop());
     run_loop_->Run();
   }
 
-  BrowsingDataCounter::ResultInt GetLocalResult() {
+  browsing_data::BrowsingDataCounter::ResultInt GetLocalResult() {
     DCHECK(finished_);
     return local_result_;
   }
 
   bool HasSyncedVisits() {
     DCHECK(finished_);
     return has_synced_visits_;
   }
 
-  void Callback(std::unique_ptr<BrowsingDataCounter::Result> result) {
+  void Callback(
+      std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
     finished_ = result->Finished();
 
     if (finished_) {
       HistoryCounter::HistoryResult* history_result =
           static_cast<HistoryCounter::HistoryResult*>(result.get());
 
       local_result_ = history_result->Value();
       has_synced_visits_ = history_result->has_synced_visits();
     }
 
@@ skipping 14 matching lines @@
     WaitForCounting();
     CountingFinishedSinceLastAsked();
   }
 
  private:
   std::unique_ptr<base::RunLoop> run_loop_;
   history::HistoryService* service_;
   base::Time time_;
 
   bool finished_;
-  BrowsingDataCounter::ResultInt local_result_;
+  browsing_data::BrowsingDataCounter::ResultInt local_result_;
   bool has_synced_visits_;
 };
 
 // Tests that the counter considers duplicate visits from the same day
 // to be a single item.
 IN_PROC_BROWSER_TEST_F(HistoryCounterTest, DuplicateVisits) {
   AddVisit("https://www.google.com");   // 1 item
   AddVisit("https://www.google.com");
   AddVisit("https://www.chrome.com");   // 2 items
   AddVisit("https://www.chrome.com");
   AddVisit("https://www.chrome.com");
   AddVisit("https://www.example.com");  // 3 items
 
   RevertTimeInDays(1);
   AddVisit("https://www.google.com");   // 4 items
   AddVisit("https://www.example.com");  // 5 items
   AddVisit("https://www.example.com");
 
   RevertTimeInDays(1);
   AddVisit("https://www.chrome.com");   // 6 items
   AddVisit("https://www.chrome.com");
   AddVisit("https://www.google.com");   // 7 items
   AddVisit("https://www.chrome.com");
   AddVisit("https://www.google.com");
   AddVisit("https://www.google.com");
   AddVisit("https://www.chrome.com");
 
-  HistoryCounter counter;
-  counter.Init(browser()->profile(),
-               base::Bind(&HistoryCounterTest::Callback,
-                          base::Unretained(this)));
+  Profile* profile = browser()->profile();
+
+  HistoryCounter counter(profile);
+  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
+                                               base::Unretained(this)));
   counter.Restart();
 
   WaitForCounting();
   EXPECT_EQ(7u, GetLocalResult());
 }
 
 // Tests that the counter starts counting automatically when the deletion
 // pref changes to true.
 IN_PROC_BROWSER_TEST_F(HistoryCounterTest, PrefChanged) {
   SetHistoryDeletionPref(false);
   AddVisit("https://www.google.com");
   AddVisit("https://www.chrome.com");
 
-  HistoryCounter counter;
-  counter.Init(browser()->profile(),
-               base::Bind(&HistoryCounterTest::Callback,
-                          base::Unretained(this)));
+  Profile* profile = browser()->profile();
+
+  HistoryCounter counter(profile);
+  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
+                                               base::Unretained(this)));
   SetHistoryDeletionPref(true);
 
   WaitForCounting();
   EXPECT_EQ(2u, GetLocalResult());
 }
 
 // Tests that the counter does not count history if the deletion
 // preference is false.
 IN_PROC_BROWSER_TEST_F(HistoryCounterTest, PrefIsFalse) {
   SetHistoryDeletionPref(false);
   AddVisit("https://www.google.com");
 
-  HistoryCounter counter;
-  counter.Init(browser()->profile(),
-               base::Bind(&HistoryCounterTest::Callback,
-                          base::Unretained(this)));
+  Profile* profile = browser()->profile();
+
+  HistoryCounter counter(profile);
+  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
+                                               base::Unretained(this)));
   counter.Restart();
 
   EXPECT_FALSE(counter.HasTrackedTasks());
 }
 
 // Tests that changing the deletion period restarts the counting, and that
 // the result takes visit dates into account.
 IN_PROC_BROWSER_TEST_F(HistoryCounterTest, PeriodChanged) {
   AddVisit("https://www.google.com");
 
   RevertTimeInDays(2);
   AddVisit("https://www.google.com");
   AddVisit("https://www.example.com");
 
   RevertTimeInDays(4);
   AddVisit("https://www.chrome.com");
   AddVisit("https://www.chrome.com");
   AddVisit("https://www.example.com");
 
   RevertTimeInDays(20);
   AddVisit("https://www.google.com");
   AddVisit("https://www.chrome.com");
   AddVisit("https://www.example.com");
 
   RevertTimeInDays(10);
   AddVisit("https://www.example.com");
   AddVisit("https://www.example.com");
   AddVisit("https://www.example.com");
 
-  HistoryCounter counter;
-  counter.Init(browser()->profile(),
-               base::Bind(&HistoryCounterTest::Callback,
-                          base::Unretained(this)));
+  Profile* profile = browser()->profile();
 
-  SetDeletionPeriodPref(BrowsingDataRemover::LAST_HOUR);
+  HistoryCounter counter(profile);
+  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
+                                               base::Unretained(this)));
+
+  SetDeletionPeriodPref(browsing_data::LAST_HOUR);
   WaitForCounting();
   EXPECT_EQ(1u, GetLocalResult());
 
-  SetDeletionPeriodPref(BrowsingDataRemover::LAST_DAY);
+  SetDeletionPeriodPref(browsing_data::LAST_DAY);
   WaitForCounting();
   EXPECT_EQ(1u, GetLocalResult());
 
-  SetDeletionPeriodPref(BrowsingDataRemover::LAST_WEEK);
+  SetDeletionPeriodPref(browsing_data::LAST_WEEK);
   WaitForCounting();
   EXPECT_EQ(5u, GetLocalResult());
 
-  SetDeletionPeriodPref(BrowsingDataRemover::FOUR_WEEKS);
+  SetDeletionPeriodPref(browsing_data::FOUR_WEEKS);
   WaitForCounting();
   EXPECT_EQ(8u, GetLocalResult());
 
-  SetDeletionPeriodPref(BrowsingDataRemover::EVERYTHING);
+  SetDeletionPeriodPref(browsing_data::EVERYTHING);
   WaitForCounting();
   EXPECT_EQ(9u, GetLocalResult());
 }
 
 // Test the behavior for a profile that syncs history.
 IN_PROC_BROWSER_TEST_F(HistoryCounterTest, Synced) {
   // WebHistoryService makes network requests, so we need to use a fake one
   // for testing.
+  Profile* profile = browser()->profile();
+
   std::unique_ptr<history::FakeWebHistoryService> service(
       new history::FakeWebHistoryService(
-          ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile()),
-          SigninManagerFactory::GetForProfile(browser()->profile()),
-          browser()->profile()->GetRequestContext()));
+          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+          SigninManagerFactory::GetForProfile(profile),
+          profile->GetRequestContext()));
 
-  HistoryCounter counter;
+  HistoryCounter counter(profile);
   counter.SetWebHistoryServiceForTesting(service.get());
-  counter.Init(browser()->profile(),
-               base::Bind(&HistoryCounterTest::Callback,
-                          base::Unretained(this)));
+  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
+                                               base::Unretained(this)));
 
   // No entries locally and no entries in Sync.
   service->SetupFakeResponse(true /* success */, net::HTTP_OK);
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(0u, GetLocalResult());
   EXPECT_FALSE(HasSyncedVisits());
 
   // No entries locally. There are some entries in Sync, but they are out of the
   // time range.
-  SetDeletionPeriodPref(BrowsingDataRemover::LAST_HOUR);
+  SetDeletionPeriodPref(browsing_data::LAST_HOUR);
   service->AddSyncedVisit(
       "www.google.com", GetCurrentTime() - base::TimeDelta::FromHours(2));
   service->AddSyncedVisit(
       "www.chrome.com", GetCurrentTime() - base::TimeDelta::FromHours(2));
   service->SetupFakeResponse(true /* success */, net::HTTP_OK);
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(0u, GetLocalResult());
   EXPECT_FALSE(HasSyncedVisits());
 
@@ skipping 49 matching lines @@
   static const int kFirstProfileIndex = 0;
   ProfileSyncService* sync_service = GetSyncService(kFirstProfileIndex);
   Profile* profile = GetProfile(kFirstProfileIndex);
 
   // Set up the fake web history service and the counter.
   std::unique_ptr<history::FakeWebHistoryService> web_history_service(
       new history::FakeWebHistoryService(
           ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile()),
           SigninManagerFactory::GetForProfile(browser()->profile()),
           browser()->profile()->GetRequestContext()));
-  HistoryCounter counter;
+  HistoryCounter counter(profile);
   counter.SetWebHistoryServiceForTesting(web_history_service.get());
-  counter.Init(profile,
-               base::Bind(&HistoryCounterTest::Callback,
-                          base::Unretained(this)));
+  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
+                                               base::Unretained(this)));
 
   // Note that some Sync operations notify observers immediately (and thus there
   // is no need to call |WaitForCounting()|; in fact, it would block the test),
   // while other operations only post the task on UI thread's message loop
   // (which requires calling |WaitForCounting()| for them to run). Therefore,
   // this test always checks if the callback has already run and only waits
   // if it has not.
 
   // We sync all datatypes by default, so starting Sync means that we start
   // syncing history deletion, and this should restart the counter.
@@ skipping 40 matching lines @@
   // history deletion did not change. However, in reality we can get two
   // notifications, one that history sync has stopped and another that it is
   // active again.
 
   // Stopping the Sync service triggers a restart.
   sync_service->RequestStop(sync_driver::SyncService::CLEAR_DATA);
   WaitForCountingOrConfirmFinished();
 }
 
 }  // namespace