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

chrome/browser/browsing_data/browsing_data_remover_impl.h

Index: chrome/browser/browsing_data/browsing_data_remover_impl.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover_impl.h b/chrome/browser/browsing_data/browsing_data_remover_impl.h
index 334c7f086dbd813f4dffa468f94ef6b001c97ef5..0e5279b7f7310d5b43c69cc2cdbbc670a6e60991 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_impl.h
+++ b/chrome/browser/browsing_data/browsing_data_remover_impl.h
@@ -97,24 +97,25 @@ class BrowsingDataRemoverImpl :
 
   void Remove(const base::Time& delete_begin,
               const base::Time& delete_end,
-              int remove_mask,
+              const std::set<const content::BrowsingDataType*>& remove_mask,
               int origin_type_mask) override;
-  void RemoveAndReply(const base::Time& delete_begin,
-                      const base::Time& delete_end,
-                      int remove_mask,
-                      int origin_type_mask,
-                      Observer* observer) override;
+  void RemoveAndReply(
+      const base::Time& delete_begin,
+      const base::Time& delete_end,
+      const std::set<const content::BrowsingDataType*>& remove_mask,
+      int origin_type_mask,
+      Observer* observer) override;
   void RemoveWithFilter(
       const base::Time& delete_begin,
       const base::Time& delete_end,
-      int remove_mask,
+      const std::set<const content::BrowsingDataType*>& remove_mask,
       int origin_type_mask,
       std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder)
       override;
   void RemoveWithFilterAndReply(
       const base::Time& delete_begin,
       const base::Time& delete_end,
-      int remove_mask,
+      const std::set<const content::BrowsingDataType*>& remove_mask,
       int origin_type_mask,
       std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder,
       Observer* observer) override;
@@ -124,7 +125,8 @@ class BrowsingDataRemoverImpl :
 
   const base::Time& GetLastUsedBeginTime() override;
   const base::Time& GetLastUsedEndTime() override;
-  int GetLastUsedRemovalMask() override;
+  const std::set<const content::BrowsingDataType*>&
+      GetLastUsedRemovalMask() override;
   int GetLastUsedOriginTypeMask() override;
 
   // Used for testing.
@@ -141,7 +143,7 @@ class BrowsingDataRemoverImpl :
   virtual void RemoveInternal(
       const base::Time& delete_begin,
       const base::Time& delete_end,
-      int remove_mask,
+      const std::set<const content::BrowsingDataType*>& remove_mask,
       int origin_type_mask,
       std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder,
       Observer* observer);
@@ -158,7 +160,7 @@ class BrowsingDataRemoverImpl :
     RemovalTask(
         const base::Time& delete_begin,
         const base::Time& delete_end,
-        int remove_mask,
+        const std::set<const content::BrowsingDataType*>& remove_mask,
         int origin_type_mask,
         std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder,
         Observer* observer);
@@ -166,7 +168,7 @@ class BrowsingDataRemoverImpl :
 
     base::Time delete_begin;
     base::Time delete_end;
-    int remove_mask;
+    const std::set<const content::BrowsingDataType*> remove_mask;
     int origin_type_mask;
     std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder;
     Observer* observer;
@@ -192,7 +194,7 @@ class BrowsingDataRemoverImpl :
   // TODO(crbug.com/589586): Support all backends w/ origin filter.
   void RemoveImpl(const base::Time& delete_begin,
                   const base::Time& delete_end,
-                  int remove_mask,
+                  const std::set<const content::BrowsingDataType*>& remove_mask,
                   const content::BrowsingDataFilterBuilder& filter_builder,
                   int origin_type_mask);
 
@@ -218,7 +220,7 @@ class BrowsingDataRemoverImpl :
   base::Time delete_end_;
 
   // The removal mask for the current removal operation.
-  int remove_mask_ = 0;
+  std::set<const content::BrowsingDataType*> remove_mask_;
 
   // From which types of origins should we remove data?
   int origin_type_mask_ = 0;