Separate state of basic and advanced tab in CBD dialog

chrome/browser/extensions/api/browsing_data/browsing_data_test.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 <memory>
 #include <string>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/pattern.h"
@@ skipping 102 matching lines @@
     EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
         function.get(),
         std::string("[{\"since\": 1}]"),
         browser()));
     EXPECT_EQ(expected_mask, GetRemovalMask());
     EXPECT_EQ(UNPROTECTED_WEB, GetOriginTypeMask());
   }
 
   void SetSinceAndVerify(browsing_data::TimePeriod since_pref) {
     PrefService* prefs = browser()->profile()->GetPrefs();
-    prefs->SetInteger(browsing_data::prefs::kDeleteTimePeriod, since_pref);
+    prefs->SetInteger(browsing_data::prefs::kDeleteTimePeriod,
+                      static_cast<int>(since_pref));
 
     scoped_refptr<BrowsingDataSettingsFunction> function =
         new BrowsingDataSettingsFunction();
     SCOPED_TRACE("settings");
     std::unique_ptr<base::Value> result_value(RunFunctionAndReturnSingleResult(
         function.get(), std::string("[]"), browser()));
 
     base::DictionaryValue* result;
     EXPECT_TRUE(result_value->GetAsDictionary(&result));
     base::DictionaryValue* options;
     EXPECT_TRUE(result->GetDictionary("options", &options));
     double since;
     EXPECT_TRUE(options->GetDouble("since", &since));
 
     double expected_since = 0;
-    if (since_pref != browsing_data::ALL_TIME) {
+    if (since_pref != browsing_data::TimePeriod::ALL_TIME) {
       base::Time time = CalculateBeginDeleteTime(since_pref);
       expected_since = time.ToJsTime();
     }
     // Even a synchronous function takes nonzero time, but the difference
     // between when the function was called and now should be well under a
     // second, so we'll make sure the requested start time is within 10 seconds.
     // Since the smallest selectable period is an hour, that should be
     // sufficient.
     EXPECT_LE(expected_since, since + 10.0 * 1000.0);
   }
@@ skipping 299 matching lines @@
   RunAndCompareRemovalMask<BrowsingDataRemovePasswordsFunction>(
       BrowsingDataRemover::REMOVE_PASSWORDS);
   RunAndCompareRemovalMask<BrowsingDataRemoveServiceWorkersFunction>(
       BrowsingDataRemover::REMOVE_SERVICE_WORKERS);
   RunAndCompareRemovalMask<BrowsingDataRemoveWebSQLFunction>(
       BrowsingDataRemover::REMOVE_WEBSQL);
 }
 
 // Test the processing of the 'delete since' preference.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSince) {
-  SetSinceAndVerify(browsing_data::ALL_TIME);
-  SetSinceAndVerify(browsing_data::LAST_HOUR);
-  SetSinceAndVerify(browsing_data::LAST_DAY);
-  SetSinceAndVerify(browsing_data::LAST_WEEK);
-  SetSinceAndVerify(browsing_data::FOUR_WEEKS);
+  SetSinceAndVerify(browsing_data::TimePeriod::ALL_TIME);
+  SetSinceAndVerify(browsing_data::TimePeriod::LAST_HOUR);
+  SetSinceAndVerify(browsing_data::TimePeriod::LAST_DAY);
+  SetSinceAndVerify(browsing_data::TimePeriod::LAST_WEEK);
+  SetSinceAndVerify(browsing_data::TimePeriod::FOUR_WEEKS);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionEmpty) {
   SetPrefsAndVerifySettings(0, 0, 0);
 }
 
 // Test straightforward settings, mapped 1:1 to data types.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSimple) {
   SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_CACHE, 0,
                             BrowsingDataRemover::REMOVE_CACHE);
@@ skipping 45 matching lines @@
       ~BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA;
 
   SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES |
                                 BrowsingDataRemover::REMOVE_HISTORY |
                                 BrowsingDataRemover::REMOVE_DOWNLOADS,
                             UNPROTECTED_WEB,
                             site_data_no_plugins_durable_usage_external |
                                 BrowsingDataRemover::REMOVE_HISTORY |
                                 BrowsingDataRemover::REMOVE_DOWNLOADS);
 }