Separate state of basic and advanced tab in CBD dialog

components/browsing_data/core/pref_names.cc

Index: components/browsing_data/core/pref_names.cc
diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc
index 87a39cbece7b0a999c81222e5fc46bf5604bb079..59113a84cc62ef116a3c86548add16f8a12597a2 100644
--- a/components/browsing_data/core/pref_names.cc
+++ b/components/browsing_data/core/pref_names.cc
@@ -12,12 +12,17 @@ namespace prefs {
 
 // Clear browsing data deletion time period.
 const char kDeleteTimePeriod[] = "browser.clear_data.time_period";
+const char kDeleteTimePeriodBasic[] = "browser.clear_data.time_period_basic";
 
 // Clear Browsing Data dialog datatype preferences.
 const char kDeleteBrowsingHistory[] = "browser.clear_data.browsing_history";
+const char kDeleteBrowsingHistoryBasic[] =
+    "browser.clear_data.browsing_history_basic";
 const char kDeleteDownloadHistory[] = "browser.clear_data.download_history";
 const char kDeleteCache[] = "browser.clear_data.cache";
+const char kDeleteCacheBasic[] = "browser.clear_data.cache_basic";
 const char kDeleteCookies[] = "browser.clear_data.cookies";
+const char kDeleteCookiesBasic[] = "browser.clear_data.cookies_basic";
 const char kDeletePasswords[] = "browser.clear_data.passwords";
 const char kDeleteFormData[] = "browser.clear_data.form_data";
 const char kDeleteHostedAppsData[] = "browser.clear_data.hosted_apps_data";
@@ -29,26 +34,35 @@ const char kLastClearBrowsingDataTime[] =
 const char kClearBrowsingDataHistoryNoticeShownTimes[] =
   "browser.clear_data.history_notice_shown_times";
 const char kLastClearBrowsingDataTab[] = "browser.last_clear_browsing_data_tab";
+const char kPreferencesMigratedToBasic[] =
+    "browser.clear_data.preferences_migrated_to_basic";
 
 void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       kDeleteTimePeriod, 0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterIntegerPref(
+      kDeleteTimePeriodBasic, 0,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       kDeleteBrowsingHistory, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      kDeleteCache, true,
+      kDeleteBrowsingHistoryBasic, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      kDeleteCookies, true,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+      kDeleteCache, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      kDeletePasswords, false,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+      kDeleteCacheBasic, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      kDeleteCookies, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      kDeleteFormData, false,
+      kDeleteCookiesBasic, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      kDeletePasswords, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      kDeleteFormData, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterIntegerPref(
       kClearBrowsingDataHistoryNoticeShownTimes, 0);
 
@@ -70,6 +84,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
       kLastClearBrowsingDataTab, 0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #endif
+
+  registry->RegisterBooleanPref(
+      kPreferencesMigratedToBasic, false,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 }  // namespace prefs