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

chrome/browser/chromeos/profiles/profile_helper.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/chromeos/profiles/profile_helper.h"
 
 #include "base/barrier_closure.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.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/chromeos/base/file_flusher.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 230 matching lines @@
       base::BarrierClosure(2, base::Bind(&ProfileHelper::OnSigninProfileCleared,
                                          weak_factory_.GetWeakPtr()));
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   // Check if signin profile was loaded.
   if (profile_manager->GetProfileByPath(GetSigninProfileDir())) {
     LOG_ASSERT(!browsing_data_remover_);
     browsing_data_remover_ =
         BrowsingDataRemoverFactory::GetForBrowserContext(GetSigninProfile());
     browsing_data_remover_->AddObserver(this);
-    browsing_data_remover_->RemoveAndReply(
-        base::Time(), base::Time::Max(), BrowsingDataRemover::REMOVE_SITE_DATA,
-        BrowsingDataHelper::ALL, this);
+    browsing_data_remover_->RemoveAndReply(base::Time(), base::Time::Max(),
+                                           BrowsingDataTypeSetSiteData(),
+                                           BrowsingDataHelper::ALL, this);
   } else {
     on_clear_profile_stage_finished_.Run();
   }
 
   if (content::StoragePartition* partition = login::GetSigninPartition()) {
     partition->ClearData(
         content::StoragePartition::REMOVE_DATA_MASK_ALL,
         content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL, GURL(),
         content::StoragePartition::OriginMatcherFunction(), base::Time(),
         base::Time::Now(), on_clear_profile_stage_finished_);
@@ skipping 213 matching lines @@
       DownloadPrefs::FromBrowserContext(profile)->DownloadPath());
   // Let extension system handle extension files.
   excludes.push_back(base::FilePath(extensions::kInstallDirectoryName));
   // Do not flush Drive cache.
   excludes.push_back(base::FilePath(chromeos::kDriveCacheDirname));
 
   profile_flusher_->RequestFlush(profile->GetPath(), excludes, base::Closure());
 }
 
 }  // namespace chromeos