Split browsing data masks between content and embedder

chrome/browser/android/preferences/pref_service_bridge.cc

Index: chrome/browser/android/preferences/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index 01f7fd7fbf7c18647ebeb8fb848a37e435038ae7..7e249211055789d5a529c59302c075949beff773 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -29,6 +29,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_remover_delegate.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/important_sites_util.h"
 #include "chrome/browser/history/web_history_service_factory.h"
@@ -646,20 +647,20 @@ static void ClearBrowsingData(
   for (const int data_type : data_types_vector) {
     switch (static_cast<browsing_data::BrowsingDataType>(data_type)) {
       case browsing_data::BrowsingDataType::HISTORY:
-        remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
+        remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY;
         break;
       case browsing_data::BrowsingDataType::CACHE:
-        remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
+        remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CACHE;
         break;
       case browsing_data::BrowsingDataType::COOKIES:
-        remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
-        remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA;
+        remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_COOKIES;
+        remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA;
         break;
       case browsing_data::BrowsingDataType::PASSWORDS:
-        remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
+        remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS;
         break;
       case browsing_data::BrowsingDataType::FORM_DATA:
-        remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
+        remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA;
         break;
       case browsing_data::BrowsingDataType::BOOKMARKS:
         // Bookmarks are deleted separately on the Java side.
@@ -696,10 +697,10 @@ static void ClearBrowsingData(
 
   // Delete the types protected by Important Sites with a filter,
   // and the rest completely.
-  int filterable_mask =
-      remove_mask & BrowsingDataRemover::IMPORTANT_SITES_DATATYPES;
+  int filterable_mask = remove_mask &
+      ChromeBrowsingDataRemoverDelegate::IMPORTANT_SITES_DATA_TYPES;
   int nonfilterable_mask = remove_mask &
-      ~BrowsingDataRemover::IMPORTANT_SITES_DATATYPES;
+      ~ChromeBrowsingDataRemoverDelegate::IMPORTANT_SITES_DATA_TYPES;
 
   // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is
   // done with both removal tasks.
@@ -714,7 +715,8 @@ static void ClearBrowsingData(
     browsing_data_remover->RemoveWithFilterAndReply(
         browsing_data::CalculateBeginDeleteTime(period),
         browsing_data::CalculateEndDeleteTime(period),
-        filterable_mask, BrowsingDataHelper::UNPROTECTED_WEB,
+        filterable_mask,
+        ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_UNPROTECTED_WEB,
         std::move(filter_builder), observer);
   } else {
     // Make sure |observer| doesn't wait for the filtered task.
@@ -725,7 +727,9 @@ static void ClearBrowsingData(
     browsing_data_remover->RemoveAndReply(
         browsing_data::CalculateBeginDeleteTime(period),
         browsing_data::CalculateEndDeleteTime(period),
-        nonfilterable_mask, BrowsingDataHelper::UNPROTECTED_WEB, observer);
+        nonfilterable_mask,
+        ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_UNPROTECTED_WEB,
+        observer);
   } else {
     // Make sure |observer| doesn't wait for the non-filtered task.
     observer->OnBrowsingDataRemoverDone();