Convert RemoveDataMask from enum to pointers and split it between content and embedder

chrome/browser/ui/webui/options/clear_browser_data_handler.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 "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
+#include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
+#include "chrome/browser/browsing_data/chrome_browsing_data_types.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/browsing_data/core/counters/browsing_data_counter.h"
@@ skipping 202 matching lines @@
 }
 
 void ClearBrowserDataHandler::HandleClearBrowserData(
     const base::ListValue* value) {
   // We should never be called when the previous clearing has not yet finished.
   CHECK(!remover_);
 
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
 
-  int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
-  // Don't try to clear LSO data if it's not supported.
-  if (!*clear_plugin_lso_data_enabled_)
-    site_data_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
-
-  int remove_mask = 0;
+  std::set<const content::BrowsingDataType*> remove_mask;
   int origin_mask = 0;
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory) &&
       *allow_deleting_browser_history_) {
-    remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
+    remove_mask.insert(&kBrowsingDataTypeHistory);
   }
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory) &&
       *allow_deleting_browser_history_) {
-    remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
+    remove_mask.insert(&kBrowsingDataTypeDownloads);
   }
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache))
-    remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
+    remove_mask.insert(&kBrowsingDataTypeCache);
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) {
-    remove_mask |= site_data_mask;
+    remove_mask.insert(BrowsingDataTypeSetSiteData().begin(),
+                       BrowsingDataTypeSetSiteData().end());
     origin_mask |= BrowsingDataHelper::UNPROTECTED_WEB;
   }
   if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords))
-    remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
+    remove_mask.insert(&kBrowsingDataTypePasswords);
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormData))
-    remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
+    remove_mask.insert(&kBrowsingDataTypeFormData);
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteMediaLicenses))
-    remove_mask |= BrowsingDataRemover::REMOVE_MEDIA_LICENSES;
+    remove_mask.insert(&kBrowsingDataTypeMediaLicenses);
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData)) {
-    remove_mask |= site_data_mask;
+    remove_mask.insert(BrowsingDataTypeSetSiteData().begin(),
+                       BrowsingDataTypeSetSiteData().end());
     origin_mask |= BrowsingDataHelper::PROTECTED_WEB;
   }
 
+  // Don't try to clear LSO data if it's not supported.
+  if (!*clear_plugin_lso_data_enabled_)
+    remove_mask.erase(&kBrowsingDataTypePluginData);
+
   // Record the deletion of cookies and cache.
   BrowsingDataRemover::CookieOrCacheDeletionChoice choice =
       BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE;
   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;
   }
@@ skipping 140 matching lines @@
       "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated",
       should_show_history_notice_);
 }
 
 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) {
   // This is used by OnBrowsingDataRemoverDone (when the deletion finishes).
   should_show_history_deletion_dialog_ = show;
 }
 
 }  // namespace options