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

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 19 matching lines @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/apps/app_url_redirector.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.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/budget_service/budget_service_impl.h"
 #include "chrome/browser/chrome_content_browser_client_parts.h"
 #include "chrome/browser/chrome_quota_permission_context.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/field_trial_recorder.h"
 #include "chrome/browser/font_family_cache.h"
@@ skipping 2656 matching lines @@
 
   // chrome: & friends.
   handler->AddHandlerPair(&HandleWebUI, &HandleWebUIReverse);
 }
 
 void ChromeContentBrowserClient::ClearCache(RenderFrameHost* rfh) {
   Profile* profile = Profile::FromBrowserContext(
       rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
   BrowsingDataRemover* remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(profile);
-  remover->Remove(base::Time(), base::Time::Max(),
-                  BrowsingDataRemover::REMOVE_CACHE,
+  remover->Remove(base::Time(), base::Time::Max(), {&kBrowsingDataTypeCache},
                   BrowsingDataHelper::UNPROTECTED_WEB);
 }
 
 void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) {
   Profile* profile = Profile::FromBrowserContext(
       rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
   BrowsingDataRemover* remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(profile);
-  int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
-  remover->Remove(base::Time(), base::Time::Max(), remove_mask,
+  remover->Remove(base::Time(), base::Time::Max(),
+                  BrowsingDataTypeSetSiteData(),
                   BrowsingDataHelper::UNPROTECTED_WEB);
 }
 
 void ChromeContentBrowserClient::ClearSiteData(
     content::BrowserContext* browser_context,
     const url::Origin& origin,
     bool remove_cookies,
     bool remove_storage,
     bool remove_cache,
     const base::Closure& callback) {
@@ skipping 16 matching lines @@
         net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 
     if (domain.empty())
       domain = origin.host();  // IP address or internal hostname.
 
     std::unique_ptr<BrowsingDataFilterBuilder> domain_filter_builder(
         BrowsingDataFilterBuilder::Create(
             BrowsingDataFilterBuilder::WHITELIST));
     domain_filter_builder->AddRegisterableDomain(domain);
 
+    std::set<const content::BrowsingDataType*> remove_mask;
+    remove_mask.insert(&kBrowsingDataTypeCookies);
+    remove_mask.insert(&kBrowsingDataTypeChannelIDs);
+    remove_mask.insert(&kBrowsingDataTypePluginData);
     remover->RemoveWithFilterAndReply(
-        base::Time(), base::Time::Max(),
-        BrowsingDataRemover::REMOVE_COOKIES |
-            BrowsingDataRemover::REMOVE_CHANNEL_IDS |
-            BrowsingDataRemover::REMOVE_PLUGIN_DATA,
-        BrowsingDataHelper::ALL, std::move(domain_filter_builder), observer);
+        base::Time(), base::Time::Max(), remove_mask, BrowsingDataHelper::ALL,
+        std::move(domain_filter_builder), observer);
   } else {
     // The first removal task is a no-op.
     observer->OnBrowsingDataRemoverDone();
   }
 
   // Delete origin-scoped data.
-  int remove_mask = 0;
+  std::set<const content::BrowsingDataType*> remove_mask;
   if (remove_storage) {
-    remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA &
-                   ~BrowsingDataRemover::REMOVE_COOKIES &
-                   ~BrowsingDataRemover::REMOVE_CHANNEL_IDS &
-                   ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
+    remove_mask = BrowsingDataTypeSetSiteData();
+    remove_mask.erase(&kBrowsingDataTypeCookies);
+    remove_mask.erase(&kBrowsingDataTypeChannelIDs);
+    remove_mask.erase(&kBrowsingDataTypePluginData);
   }
   if (remove_cache)
-    remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
+    remove_mask.insert(&kBrowsingDataTypeCache);
 
-  if (remove_mask) {
+  if (!remove_mask.empty()) {
     std::unique_ptr<BrowsingDataFilterBuilder> origin_filter_builder(
         BrowsingDataFilterBuilder::Create(
             BrowsingDataFilterBuilder::WHITELIST));
     origin_filter_builder->AddOrigin(origin);
 
     remover->RemoveWithFilterAndReply(
         base::Time(), base::Time::Max(),
         remove_mask, BrowsingDataHelper::ALL, std::move(origin_filter_builder),
         observer);
   } else {
@@ skipping 744 matching lines @@
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }
 
 // static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }