Deprecate the CallbackSubscription in BrowsingDataRemover

chrome/browser/browsing_data/browsing_data_remover.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_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 126 matching lines @@
   // A helper enum to report the deletion of cookies and/or cache. Do not
   // reorder the entries, as this enum is passed to UMA.
   enum CookieOrCacheDeletionChoice {
     NEITHER_COOKIES_NOR_CACHE,
     ONLY_COOKIES,
     ONLY_CACHE,
     BOTH_COOKIES_AND_CACHE,
     MAX_CHOICE_VALUE
   };
 
-  // When BrowsingDataRemover successfully removes data, a notification of type
-  // NOTIFICATION_BROWSING_DATA_REMOVED is triggered with a Details object of
-  // this type.
-  struct NotificationDetails {
-    NotificationDetails();
-    NotificationDetails(const NotificationDetails& details);
-    NotificationDetails(base::Time removal_begin,
-                       int removal_mask,
-                       int origin_type_mask);
-    ~NotificationDetails();
-
-    // The beginning of the removal time range.
-    base::Time removal_begin;
-
-    // The removal mask (see the RemoveDataMask enum for details).
-    int removal_mask;
-
-    // The origin type mask (see BrowsingDataHelper::OriginTypeMask for
-    // details).
-    int origin_type_mask;
-  };
-
   struct TimeRange {
     TimeRange(base::Time begin, base::Time end) : begin(begin), end(end) {}
     bool operator==(const TimeRange& other) const;
 
     base::Time begin;
     base::Time end;
   };
 
   // Observer is notified when the removal is active and when it's done.
   class Observer {
    public:
     // NOTE: DEPRECATED; talk to dbeam/msramek before using this.
     //
     // Whether removal is active. Note that not having an active removal is not
     // same as completing a removal. That is why the removing status is separate
     // from the done message.
     virtual void OnBrowsingDataRemoving(bool is_removing) {}
 
     // Done means keywords have been deleted, cache cleared and all other
     // removal tasks are scheduled.
     virtual void OnBrowsingDataRemoverDone() {}
 
    protected:
     virtual ~Observer() {}
   };
 
-  using Callback = base::Callback<void(const NotificationDetails&)>;
-  using CallbackSubscription = std::unique_ptr<
-      base::CallbackList<void(const NotificationDetails&)>::Subscription>;
-
   // The completion inhibitor can artificially delay completion of the browsing
   // data removal process. It is used during testing to simulate scenarios in
   // which the deletion stalls or takes a very long time.
   class CompletionInhibitor {
    public:
     // Invoked when a |remover| is just about to complete clearing browser data,
     // and will be prevented from completing until after the callback
     // |continue_to_completion| is run.
     virtual void OnBrowsingDataRemoverWouldComplete(
         BrowsingDataRemover* remover,
@@ skipping 12 matching lines @@
 
   // Sets a CompletionInhibitor, which will be notified each time an instance is
   // about to complete a browsing data removal process, and will be able to
   // artificially delay the completion.
   // TODO(crbug.com/483528): Make this non-static.
   static void set_completion_inhibitor_for_testing(
       CompletionInhibitor* inhibitor) {
     completion_inhibitor_ = inhibitor;
   }
 
-  // Add a callback to the list of callbacks to be called during a browsing data
-  // removal event. Returns a subscription object that can be used to
-  // un-register the callback.
-  // TODO(crbug.com/483528): Make this non-static and merge it with the Observer
-  // interface.
-  static CallbackSubscription RegisterOnBrowsingDataRemovedCallback(
-      const Callback& callback);
-
   // Removes the specified items related to browsing for all origins that match
   // the provided |origin_type_mask| (see BrowsingDataHelper::OriginTypeMask).
   void Remove(const TimeRange& time_range,
               int remove_mask,
               int origin_type_mask);
 
   // Removes the specified items related to browsing for all origins that match
   // the provided |origin_type_mask| (see BrowsingDataHelper::OriginTypeMask).
   // The |origin_filter| is used as a final filter for clearing operations.
   // TODO(dmurph): Support all backends with filter (crbug.com/113621).
   // DO NOT USE THIS METHOD UNLESS CALLER KNOWS WHAT THEY'RE DOING. NOT ALL
   // BACKENDS ARE SUPPORTED YET, AND MORE DATA THAN EXPECTED COULD BE DELETED.
   virtual void RemoveWithFilter(const TimeRange& time_range,
                                 int remove_mask,
                                 int origin_type_mask,
                                 const BrowsingDataFilterBuilder& origin_filter);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Used for testing.
   void OverrideStoragePartitionForTesting(
       content::StoragePartition* storage_partition);
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
   void OverrideWebappRegistryForTesting(
       std::unique_ptr<WebappRegistry> webapp_registry);
 #endif
 
+  // Parameters of the last call are exposed to be used by tests.
+  // TODO(msramek): If other consumers than tests are interested in this,
+  // consider returning them in OnBrowsingDataRemoverDone() callback.
+  const base::Time& GetLastUsedBeginTime();
+  const base::Time& GetLastUsedEndTime();
+  int GetLastUsedRemovalMask();
+  int GetLastUsedOriginTypeMask();
+
  protected:
   // Use BrowsingDataRemoverFactory::GetForBrowserContext to get an instance of
   // this class. The constructor is protected so that the class is mockable.
   BrowsingDataRemover(content::BrowserContext* browser_context);
   ~BrowsingDataRemover() override;
 
  private:
   // The clear API needs to be able to toggle removing_ in order to test that
   // only one BrowsingDataRemover instance can be called at a time.
   FRIEND_TEST_ALL_PREFIXES(ExtensionBrowsingDataTest, OneAtATime);
@@ skipping 228 matching lines @@
   // not initialised, so the registry must be mocked out.
   std::unique_ptr<WebappRegistry> webapp_registry_;
 #endif
 
   base::WeakPtrFactory<BrowsingDataRemover> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_