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

chrome/browser/browsing_data/browsing_data_remover_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_IMPL_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_IMPL_H_
 
 #include <stdint.h>
 
 #include <queue>
@@ skipping 79 matching lines @@
     completion_inhibitor_ = inhibitor;
   }
 
   // BrowsingDataRemover implementation:
   void SetEmbedderDelegate(
       std::unique_ptr<BrowsingDataRemoverDelegate> embedder_delegate) override;
   BrowsingDataRemoverDelegate* GetEmbedderDelegate() const override;
 
   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;
 
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
 
   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.
   void OverrideStoragePartitionForTesting(
       content::StoragePartition* storage_partition);
 
  protected:
   // Use BrowsingDataRemoverFactory::GetForBrowserContext to get an instance of
   // this class. The constructor is protected so that the class is mockable.
   explicit BrowsingDataRemoverImpl(content::BrowserContext* browser_context);
   ~BrowsingDataRemoverImpl() override;
 
   // A common reduction of all public Remove[WithFilter][AndReply] methods.
   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);
 
  private:
   // Testing the private RemovalTask.
   FRIEND_TEST_ALL_PREFIXES(BrowsingDataRemoverImplTest, MultipleTasks);
 
   friend class BrowsingDataRemoverFactory;
 
   // Represents a single removal task. Contains all parameters needed to execute
   // it and a pointer to the observer that added it.
   struct RemovalTask {
     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);
     ~RemovalTask();
 
     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;
   };
 
   void Shutdown() override;
 
   // Setter for |is_removing_|; DCHECKs that we can only start removing if we're
   // not already removing, and vice-versa.
   void SetRemoving(bool is_removing);
 
   // Executes the next removal task. Called after the previous task was finished
   // or directly from Remove() if the task queue was empty.
   void RunNextTask();
 
   // Removes the specified items related to browsing for a specific host. If the
   // provided |remove_url| is empty, data is removed for all origins; otherwise,
   // it is restricted by the origin filter origin (where implemented yet). The
   // |origin_type_mask| parameter defines the set of origins from which data
   // should be removed (protected, unprotected, or both).
   // TODO(ttr314): Remove "(where implemented yet)" constraint above once
   // crbug.com/113621 is done.
   // 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);
 
   // Notifies observers and transitions to the idle state.
   void Notify();
 
   // Checks if we are all done, and if so, calls Notify().
   void NotifyIfDone();
 
   // Returns true if we're all done.
   bool AllDone();
 
   // The browser context we're to remove from.
   content::BrowserContext* browser_context_;
 
   // A delegate to delete the embedder-specific data.
   std::unique_ptr<BrowsingDataRemoverDelegate> embedder_delegate_;
 
   // Start time to delete from.
   base::Time delete_begin_;
 
   // End time to delete to.
   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;
 
   // True if Remove has been invoked.
   bool is_removing_;
 
   // Removal tasks to be processed.
   std::queue<RemovalTask> task_queue_;
 
@@ skipping 19 matching lines @@
 
   // We do not own this.
   content::StoragePartition* storage_partition_for_testing_ = nullptr;
 
   base::WeakPtrFactory<BrowsingDataRemoverImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_IMPL_H_