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

chrome/browser/profile_resetter/profile_resetter.cc

 // Copyright (c) 2013 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/profile_resetter/profile_resetter.h"
 
 #include <stddef.h>
 
+#include <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "build/build_config.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/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
@@ skipping 217 matching lines @@
   }
   MarkAsDone(CONTENT_SETTINGS);
 }
 
 void ProfileResetter::ResetCookiesAndSiteData() {
   DCHECK(CalledOnValidThread());
   DCHECK(!cookies_remover_);
 
   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);
 }
 
 void ProfileResetter::ResetExtensions() {
   DCHECK(CalledOnValidThread());
 
   std::vector<std::string> brandcode_extensions;
   master_settings_->GetExtensions(&brandcode_extensions);
 
@@ skipping 108 matching lines @@
         chrome_exe,
         false,
         cancel,
         &shortcuts);
   }
   return shortcuts;
 #else
   return std::vector<ShortcutCommand>();
 #endif
 }