Separate state of basic and advanced tab in CBD dialog

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 3620411528dccaf3ef90c4e56e2347e7ac81a11f..29fca8394779e5945711a56034f83be99b2af62d 100644
--- a/chrome/browser/browsing_data/cache_counter_browsertest.cc
+++ b/chrome/browser/browsing_data/cache_counter_browsertest.cc
@@ -34,7 +34,7 @@ class CacheCounterTest : public InProcessBrowserTest {
  public:
   void SetUpOnMainThread() override {
     SetCacheDeletionPref(true);
-    SetDeletionPeriodPref(browsing_data::ALL_TIME);
+    SetDeletionPeriodPref(browsing_data::TimePeriod::ALL_TIME);
   }
 
   void SetCacheDeletionPref(bool value) {
@@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(CacheCounterTest, Empty) {
 
   CacheCounter counter(profile);
   counter.Init(
-      profile->GetPrefs(),
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
       base::Bind(&CacheCounterTest::CountingCallback, base::Unretained(this)));
   counter.Restart();
 
@@ -198,7 +198,7 @@ IN_PROC_BROWSER_TEST_F(CacheCounterTest, NonEmpty) {
   Profile* profile = browser()->profile();
   CacheCounter counter(profile);
   counter.Init(
-      profile->GetPrefs(),
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
       base::Bind(&CacheCounterTest::CountingCallback, base::Unretained(this)));
   counter.Restart();
 
@@ -214,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(CacheCounterTest, AfterDoom) {
   Profile* profile = browser()->profile();
   CacheCounter counter(profile);
   counter.Init(
-      profile->GetPrefs(),
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
       base::Bind(&CacheCounterTest::CountingCallback, base::Unretained(this)));
 
   browsing_data::StoragePartitionHttpCacheDataRemover::CreateForRange(
@@ -236,7 +236,7 @@ IN_PROC_BROWSER_TEST_F(CacheCounterTest, PrefChanged) {
   Profile* profile = browser()->profile();
   CacheCounter counter(profile);
   counter.Init(
-      profile->GetPrefs(),
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
       base::Bind(&CacheCounterTest::CountingCallback, base::Unretained(this)));
   SetCacheDeletionPref(true);
 
@@ -251,26 +251,26 @@ IN_PROC_BROWSER_TEST_F(CacheCounterTest, PeriodChanged) {
   Profile* profile = browser()->profile();
   CacheCounter counter(profile);
   counter.Init(
-      profile->GetPrefs(),
+      profile->GetPrefs(), browsing_data::ClearBrowsingDataTab::ADVANCED,
       base::Bind(&CacheCounterTest::CountingCallback, base::Unretained(this)));
 
-  SetDeletionPeriodPref(browsing_data::LAST_HOUR);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_HOUR);
   WaitForIOThread();
   browsing_data::BrowsingDataCounter::ResultInt result = GetResult();
 
-  SetDeletionPeriodPref(browsing_data::LAST_DAY);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_DAY);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 
-  SetDeletionPeriodPref(browsing_data::LAST_WEEK);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_WEEK);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 
-  SetDeletionPeriodPref(browsing_data::FOUR_WEEKS);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::FOUR_WEEKS);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 
-  SetDeletionPeriodPref(browsing_data::ALL_TIME);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::ALL_TIME);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
   EXPECT_FALSE(IsUpperLimit());