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

chrome/browser/profile_resetter/profile_resetter.cc

Index: chrome/browser/profile_resetter/profile_resetter.cc
diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc
index cf97bf1ca567a898eee7aa34a959a9703b75073f..dab75e5ff2891088c63377fbf2555bbe24e6c57e 100644
--- a/chrome/browser/profile_resetter/profile_resetter.cc
+++ b/chrome/browser/profile_resetter/profile_resetter.cc
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 
+#include <set>
 #include <string>
 #include <vector>
 
@@ -15,6 +16,7 @@
 #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/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
@@ -252,14 +254,15 @@ void ProfileResetter::ResetCookiesAndSiteData() {
 
   cookies_remover_ = BrowsingDataRemoverFactory::GetForBrowserContext(profile_);
   cookies_remover_->AddObserver(this);
-  int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA |
-                    BrowsingDataRemover::REMOVE_CACHE;
+  std::set<const content::BrowsingDataType*> remove_mask =
+      BrowsingDataTypeSetSiteData();
+  remove_mask.insert(&kBrowsingDataTypeCache);
   PrefService* prefs = profile_->GetPrefs();
   DCHECK(prefs);
 
   // Don't try to clear LSO data if it's not supported.
   if (!prefs->GetBoolean(prefs::kClearPluginLSODataEnabled))
-    remove_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
+    remove_mask.erase(&kBrowsingDataTypePluginData);
   cookies_remover_->RemoveAndReply(base::Time(), base::Time::Max(), remove_mask,
                                    BrowsingDataHelper::UNPROTECTED_WEB, this);
 }