Move browsing data deletion prefs to components

chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 11d122f3b90ed72ff34e36f67da9afbdcdad0b78..eecef3ad189a484b09beef03a01ceb9f98811695 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -60,11 +60,11 @@ const char kMyActivityUrlInDialog[] =
 const int kMaxTimesHistoryNoticeShown = 1;
 
 const char* kCounterPrefs[] = {
-  prefs::kDeleteBrowsingHistory,
-  prefs::kDeleteCache,
-  prefs::kDeleteFormData,
-  prefs::kDeleteMediaLicenses,
-  prefs::kDeletePasswords,
+  browsing_data::prefs::kDeleteBrowsingHistory,
+  browsing_data::prefs::kDeleteCache,
+  browsing_data::prefs::kDeleteFormData,
+  browsing_data::prefs::kDeleteMediaLicenses,
+  browsing_data::prefs::kDeletePasswords,
 };
 
 }  // namespace
@@ -254,27 +254,27 @@ void ClearBrowserDataHandler::HandleClearBrowserData(
 
   int remove_mask = 0;
   int origin_mask = 0;
-  if (prefs->GetBoolean(prefs::kDeleteBrowsingHistory) &&
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory) &&
       *allow_deleting_browser_history_) {
     remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
   }
-  if (prefs->GetBoolean(prefs::kDeleteDownloadHistory) &&
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory) &&
       *allow_deleting_browser_history_) {
     remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   }
-  if (prefs->GetBoolean(prefs::kDeleteCache))
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache))
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
-  if (prefs->GetBoolean(prefs::kDeleteCookies)) {
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) {
     remove_mask |= site_data_mask;
     origin_mask |= BrowsingDataHelper::UNPROTECTED_WEB;
   }
-  if (prefs->GetBoolean(prefs::kDeletePasswords))
+  if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
-  if (prefs->GetBoolean(prefs::kDeleteFormData))
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormData))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
-  if (prefs->GetBoolean(prefs::kDeleteMediaLicenses))
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteMediaLicenses))
     remove_mask |= BrowsingDataRemover::REMOVE_MEDIA_LICENSES;
-  if (prefs->GetBoolean(prefs::kDeleteHostedAppsData)) {
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData)) {
     remove_mask |= site_data_mask;
     origin_mask |= BrowsingDataHelper::PROTECTED_WEB;
   }
@@ -282,11 +282,11 @@ void ClearBrowserDataHandler::HandleClearBrowserData(
   // Record the deletion of cookies and cache.
   BrowsingDataRemover::CookieOrCacheDeletionChoice choice =
       BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE;
-  if (prefs->GetBoolean(prefs::kDeleteCookies)) {
-    choice = prefs->GetBoolean(prefs::kDeleteCache)
-        ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE
-        : BrowsingDataRemover::ONLY_COOKIES;
-  } else if (prefs->GetBoolean(prefs::kDeleteCache)) {
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) {
+    choice = prefs->GetBoolean(browsing_data::prefs::kDeleteCache)
+                 ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE
+                 : BrowsingDataRemover::ONLY_COOKIES;
+  } else if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) {
     choice = BrowsingDataRemover::ONLY_CACHE;
   }
   UMA_HISTOGRAM_ENUMERATION(
@@ -294,15 +294,15 @@ void ClearBrowserDataHandler::HandleClearBrowserData(
       choice, BrowsingDataRemover::MAX_CHOICE_VALUE);
 
   // Record the circumstances under which passwords are deleted.
-  if (prefs->GetBoolean(prefs::kDeletePasswords)) {
+  if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords)) {
     static const char* other_types[] = {
-        prefs::kDeleteBrowsingHistory,
-        prefs::kDeleteDownloadHistory,
-        prefs::kDeleteCache,
-        prefs::kDeleteCookies,
-        prefs::kDeleteFormData,
-        prefs::kDeleteHostedAppsData,
-        prefs::kDeleteMediaLicenses,
+        browsing_data::prefs::kDeleteBrowsingHistory,
+        browsing_data::prefs::kDeleteDownloadHistory,
+        browsing_data::prefs::kDeleteCache,
+        browsing_data::prefs::kDeleteCookies,
+        browsing_data::prefs::kDeleteFormData,
+        browsing_data::prefs::kDeleteHostedAppsData,
+        browsing_data::prefs::kDeleteMediaLicenses,
     };
     static size_t num_other_types = arraysize(other_types);
     int checked_other_types = std::count_if(
@@ -343,7 +343,7 @@ void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
       // 1. The dialog is relevant for the user.
       should_show_history_deletion_dialog_ &&
       // 2. The selected data types contained browsing history.
-      prefs->GetBoolean(prefs::kDeleteBrowsingHistory) &&
+      prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory) &&
       // 3. The notice has been shown less than |kMaxTimesHistoryNoticeShown|.
       notice_shown_times < kMaxTimesHistoryNoticeShown;