Deprecate the CallbackSubscription in BrowsingDataRemover

chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

Index: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
index 3db0c9b67758708dee0a610f6e514c8edaace88e..73094b27f434f02df1e2be9ab7105bd1c3b83df8 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -46,34 +46,22 @@ const char kRemoveEverythingArguments[] =
 
 class ExtensionBrowsingDataTest : public InProcessBrowserTest {
  public:
-  base::Time GetBeginTime() {
-    return called_with_details_->removal_begin;
+  const base::Time& GetBeginTime() {
+    return remover_->GetLastUsedBeginTime();
   }
 
   int GetRemovalMask() {
-    return called_with_details_->removal_mask;
+    return remover_->GetLastUsedRemovalMask();
   }
 
   int GetOriginTypeMask() {
-    return called_with_details_->origin_type_mask;
+    return remover_->GetLastUsedOriginTypeMask();
   }
 
  protected:
   void SetUpOnMainThread() override {
-    called_with_details_.reset(new BrowsingDataRemover::NotificationDetails());
-    callback_subscription_ =
-        BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
-            base::Bind(&ExtensionBrowsingDataTest::NotifyWithDetails,
-                       base::Unretained(this)));
-  }
-
-  // Callback for browsing data removal events.
-  void NotifyWithDetails(
-      const BrowsingDataRemover::NotificationDetails& details) {
-    // We're not taking ownership of the details object, but storing a copy of
-    // it locally.
-    called_with_details_.reset(
-        new BrowsingDataRemover::NotificationDetails(details));
+    remover_ =
+        BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile());
   }
 
   int GetAsMask(const base::DictionaryValue* dict, std::string path,
@@ -256,10 +244,8 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest {
   }
 
  private:
-  std::unique_ptr<BrowsingDataRemover::NotificationDetails>
-      called_with_details_;
-
-  BrowsingDataRemover::CallbackSubscription callback_subscription_;
+  // Cached pointer to BrowsingDataRemover for access to testing methods.
+  BrowsingDataRemover* remover_;
 };
 
 }  // namespace
@@ -277,7 +263,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, OneAtATime) {
   browsing_data_remover->SetRemoving(false);
 
   EXPECT_EQ(base::Time(), GetBeginTime());
-  EXPECT_EQ(-1, GetRemovalMask());
+  EXPECT_EQ(0, GetRemovalMask());

[Mike West, 2016/07/28 12:02:22]

Why did this change?

[msramek, 2016/07/28 12:20:49]

Previously, "no notification received yet" was represented by an empty instance
of BrowsingDataRemover::NotificationDetails; NotificationDetails initializes all
masks to -1.

BrowsingDataRemover doesn't do that, so the stored masks are implicitly
initialized to 0 (until the first Remove() call sets it to some real value).

But I guess someone could potentially call Remove() with an empty mask, so we
can do the same there.

 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, RemovalProhibited) {