Separate state of basic and advanced tab in CBD dialog

chrome/browser/browsing_data/downloads_counter_browsertest.cc

 // Copyright 2016 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/downloads_counter.h"
 
 #include <set>
 
 #include "base/files/file_path.h"
 #include "base/guid.h"
@@ skipping 28 matching lines @@
         content::BrowserContext::GetDownloadManager(browser()->profile());
     history_ =
         DownloadServiceFactory::GetForBrowserContext(browser()->profile())->
             GetDownloadHistory();
     history_->AddObserver(this);
 
     otr_manager_ =
         content::BrowserContext::GetDownloadManager(
             browser()->profile()->GetOffTheRecordProfile());
     SetDownloadsDeletionPref(true);
-    SetDeletionPeriodPref(browsing_data::ALL_TIME);
+    SetDeletionPeriodPref(browsing_data::TimePeriod::ALL_TIME);
   }
 
   void TearDownOnMainThread() override {
     history_->RemoveObserver(this);
   }
 
   // Adding and removing download items. ---------------------------------------
 
   std::string AddDownload() {
     std::string guid = AddDownloadInternal(
@@ skipping 181 matching lines @@
 
   bool finished_;
   browsing_data::BrowsingDataCounter::ResultInt result_;
 };
 
 // Tests that we count the total number of downloads correctly.
 IN_PROC_BROWSER_TEST_F(DownloadsCounterTest, Count) {
   Profile* profile = browser()->profile();
   DownloadsCounter counter(profile);
   counter.Init(profile->GetPrefs(),
+               browsing_data::ClearBrowsingDataTab::ADVANCED,
                base::Bind(&DownloadsCounterTest::ResultCallback,
                           base::Unretained(this)));
   counter.Restart();
   EXPECT_EQ(0u, GetResult());
 
   std::string first_download = AddDownload();
   AddDownload();
   std::string last_download = AddDownload();
   WaitForDownloadHistory();
   counter.Restart();
   EXPECT_EQ(3, GetResult());
 
   RemoveDownload(last_download);
   RemoveDownload(first_download);
   WaitForDownloadHistory();
   counter.Restart();
   EXPECT_EQ(1, GetResult());
 
   AddDownload();
   WaitForDownloadHistory();
   counter.Restart();
   EXPECT_EQ(2, GetResult());
 }
 
 // Tests that not just standard complete downloads are counted.
 IN_PROC_BROWSER_TEST_F(DownloadsCounterTest, Types) {
   Profile* profile = browser()->profile();
   DownloadsCounter counter(profile);
   counter.Init(profile->GetPrefs(),
+               browsing_data::ClearBrowsingDataTab::ADVANCED,
                base::Bind(&DownloadsCounterTest::ResultCallback,
                           base::Unretained(this)));
 
   AddDownload();
   AddDownloadWithProperties(
       content::DownloadItem::COMPLETE,
       content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE,
       content::DOWNLOAD_INTERRUPT_REASON_NONE);
   AddDownloadWithProperties(
       content::DownloadItem::COMPLETE,
@@ skipping 15 matching lines @@
   WaitForDownloadHistory();
   counter.Restart();
   EXPECT_EQ(6u, GetResult());
 }
 
 // Tests that downloads not persisted by DownloadHistory are not counted.
 IN_PROC_BROWSER_TEST_F(DownloadsCounterTest, NotPersisted) {
   Profile* profile = browser()->profile();
   DownloadsCounter counter(profile);
   counter.Init(profile->GetPrefs(),
+               browsing_data::ClearBrowsingDataTab::ADVANCED,
                base::Bind(&DownloadsCounterTest::ResultCallback,
                           base::Unretained(this)));
 
   // Extension and user scripts download are not persisted.
   AddDownload();
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   AddUserScriptDownload();
   AddExtensionDownload();
 #endif
 
@@ skipping 29 matching lines @@
   RevertTimeInHours(30 * 24);
   AddDownload();
   AddDownload();
   AddDownload();  // 11 items
 
   WaitForDownloadHistory();
 
   Profile* profile = browser()->profile();
   DownloadsCounter counter(profile);
   counter.Init(profile->GetPrefs(),
+               browsing_data::ClearBrowsingDataTab::ADVANCED,
                base::Bind(&DownloadsCounterTest::ResultCallback,
                           base::Unretained(this)));
 
-  SetDeletionPeriodPref(browsing_data::LAST_HOUR);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_HOUR);
   EXPECT_EQ(2u, GetResult());
 
-  SetDeletionPeriodPref(browsing_data::LAST_DAY);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_DAY);
   EXPECT_EQ(5u, GetResult());
 
-  SetDeletionPeriodPref(browsing_data::LAST_WEEK);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::LAST_WEEK);
   EXPECT_EQ(7u, GetResult());
 
-  SetDeletionPeriodPref(browsing_data::FOUR_WEEKS);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::FOUR_WEEKS);
   EXPECT_EQ(8u, GetResult());
 
-  SetDeletionPeriodPref(browsing_data::ALL_TIME);
+  SetDeletionPeriodPref(browsing_data::TimePeriod::ALL_TIME);
   EXPECT_EQ(11u, GetResult());
 }
 
 }  // namespace