Separate state of basic and advanced tab in CBD dialog

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 "components/browsing_data/core/counters/history_counter.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 31 matching lines @@
   void SetUpOnMainThread() override {
     time_ = base::Time::Now();
     history_service_ = HistoryServiceFactory::GetForProfileWithoutCreating(
         browser()->profile());
     fake_web_history_service_.reset(new history::FakeWebHistoryService(
         ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile()),
         SigninManagerFactory::GetForProfile(browser()->profile()),
         browser()->profile()->GetRequestContext()));
 
     SetHistoryDeletionPref(true);
-    SetDeletionPeriodPref(browsing_data::ALL_TIME);
+    SetDeletionPeriodPref(browsing_data::TimePeriod::ALL_TIME);
   }
 
   void AddVisit(const std::string url) {
     history_service_->AddPage(GURL(url), time_, history::SOURCE_BROWSED);
   }
 
   const base::Time& GetCurrentTime() {
     return time_;
   }
 
@@ skipping 111 matching lines @@
 
   Profile* profile = browser()->profile();
 
   browsing_data::HistoryCounter counter(
       GetHistoryService(),
       base::Bind(&HistoryCounterTest::GetRealWebHistoryService,
                  base::Unretained(this),
                  base::Unretained(profile)),
       ProfileSyncServiceFactory::GetForProfile(profile));
 
-  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
-                                               base::Unretained(this)));
+  counter.Init(
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
+      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");
 
   Profile* profile = browser()->profile();
 
   browsing_data::HistoryCounter counter(
       GetHistoryService(),
       base::Bind(&HistoryCounterTest::GetRealWebHistoryService,
                  base::Unretained(this),
                  base::Unretained(profile)),
       ProfileSyncServiceFactory::GetForProfile(profile));
 
-  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
-                                               base::Unretained(this)));
+  counter.Init(
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
+      base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
   SetHistoryDeletionPref(true);
 
   WaitForCounting();
   EXPECT_EQ(2u, GetLocalResult());
 }
 
 // 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");
@@ skipping 19 matching lines @@
 
   Profile* profile = browser()->profile();
 
   browsing_data::HistoryCounter counter(
       GetHistoryService(),
       base::Bind(&HistoryCounterTest::GetRealWebHistoryService,
                  base::Unretained(this),
                  base::Unretained(profile)),
       ProfileSyncServiceFactory::GetForProfile(profile));
 
-  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
-                                               base::Unretained(this)));
+  counter.Init(
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
+      base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
 
-  SetDeletionPeriodPref(browsing_data::LAST_HOUR);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_HOUR);
   WaitForCounting();
   EXPECT_EQ(1u, GetLocalResult());
 
-  SetDeletionPeriodPref(browsing_data::LAST_DAY);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_DAY);
   WaitForCounting();
   EXPECT_EQ(1u, GetLocalResult());
 
-  SetDeletionPeriodPref(browsing_data::LAST_WEEK);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_WEEK);
   WaitForCounting();
   EXPECT_EQ(5u, GetLocalResult());
 
-  SetDeletionPeriodPref(browsing_data::FOUR_WEEKS);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::FOUR_WEEKS);
   WaitForCounting();
   EXPECT_EQ(8u, GetLocalResult());
 
-  SetDeletionPeriodPref(browsing_data::ALL_TIME);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::ALL_TIME);
   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();
 
   browsing_data::HistoryCounter counter(
       GetHistoryService(),
       base::Bind(&HistoryCounterTest::GetFakeWebHistoryService,
                  base::Unretained(this),
                  base::Unretained(profile),
                  false),
       ProfileSyncServiceFactory::GetForProfile(profile));
 
-  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
-                                               base::Unretained(this)));
+  counter.Init(
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
+      base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
 
   history::FakeWebHistoryService* service =
     static_cast<history::FakeWebHistoryService*>(GetFakeWebHistoryService(
         profile, false));
 
   // 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(browsing_data::LAST_HOUR);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::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 54 matching lines @@
   // Set up the fake web history service and the counter.
 
   browsing_data::HistoryCounter counter(
       GetHistoryService(),
       base::Bind(&HistoryCounterTest::GetFakeWebHistoryService,
                  base::Unretained(this),
                  base::Unretained(profile),
                  true),
       sync_service);
 
-  counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
-                                               base::Unretained(this)));
+  counter.Init(
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
+      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(syncer::SyncService::CLEAR_DATA);
   WaitForCountingOrConfirmFinished();
 }
 
 }  // namespace