Deprecate the CallbackSubscription in BrowsingDataRemover

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

 // 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.
 
 #include <memory>
 #include <string>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/pattern.h"
@@ skipping 28 matching lines @@
     "\"appcache\": true, \"cache\": true, \"cookies\": true, "
     "\"downloads\": true, \"fileSystems\": true, \"formData\": true, "
     "\"history\": true, \"indexedDB\": true, \"localStorage\": true, "
     "\"serverBoundCertificates\": true, \"passwords\": true, "
     "\"pluginData\": true, \"serviceWorkers\": true, \"cacheStorage\": true, "
     "\"webSQL\": true"
     "}]";
 
 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,
                 int mask_value) {
     bool result;
     EXPECT_TRUE(dict->GetBoolean(path, &result)) << "for " << path;
     return result ? mask_value : 0;
   }
 
   void RunBrowsingDataRemoveFunctionAndCompareRemovalMask(
@@ skipping 162 matching lines @@
         function.get(), args, browser())) << " for " << args;
     } else {
       EXPECT_TRUE(base::MatchPattern(
           RunFunctionAndReturnError(function.get(), args, browser()),
           extension_browsing_data_api_constants::kDeleteProhibitedError))
           << " for " << args;
     }
   }
 
  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
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, OneAtATime) {
   BrowsingDataRemover* browsing_data_remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile());
   browsing_data_remover->SetRemoving(true);
   scoped_refptr<BrowsingDataRemoveFunction> function =
       new BrowsingDataRemoveFunction();
   EXPECT_TRUE(base::MatchPattern(
       RunFunctionAndReturnError(function.get(), kRemoveEverythingArguments,
                                 browser()),
       extension_browsing_data_api_constants::kOneAtATimeError));
   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) {
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kAllowDeletingBrowserHistory, false);
 
   CheckRemovalPermitted("{\"appcache\": true}", true);
   CheckRemovalPermitted("{\"cache\": true}", true);
   CheckRemovalPermitted("{\"cookies\": true}", true);
   CheckRemovalPermitted("{\"downloads\": true}", false);
@@ skipping 245 matching lines @@
 
   SetPrefsAndVerifySettings(
       BrowsingDataRemover::REMOVE_COOKIES |
           BrowsingDataRemover::REMOVE_HISTORY |
           BrowsingDataRemover::REMOVE_DOWNLOADS,
     UNPROTECTED_WEB,
     site_data_no_plugins |
         BrowsingDataRemover::REMOVE_HISTORY |
         BrowsingDataRemover::REMOVE_DOWNLOADS);
 }