Convert AutoBlocker static class to KeyedService.

chrome/browser/browsing_data/browsing_data_remover_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <list>
 #include <memory>
 #include <set>
@@ skipping 10 matching lines @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_filter_builder.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
@@ skipping 1009 matching lines @@
   password_manager::MockPasswordStore* store() { return store_; }
 
  private:
   password_manager::MockPasswordStore* store_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovePasswordsTester);
 };
 
 class RemovePermissionPromptCountsTest {
  public:
-  explicit RemovePermissionPromptCountsTest(TestingProfile* profile)
-      : profile_(profile) {}
+  explicit RemovePermissionPromptCountsTest(TestingProfile* profile) {
+    autoblocker_ = PermissionDecisionAutoBlocker::GetForProfile(profile);
+  }
 
   int GetDismissCount(const GURL& url, content::PermissionType permission) {
-    return PermissionDecisionAutoBlocker::GetDismissCount(
-        url, permission, profile_);
+    return autoblocker_->GetDismissCount(url, permission);
   }
 
   int GetIgnoreCount(const GURL& url, content::PermissionType permission) {
-    return PermissionDecisionAutoBlocker::GetIgnoreCount(
-        url, permission, profile_);
+    return autoblocker_->GetIgnoreCount(url, permission);
   }
 
   int RecordIgnore(const GURL& url, content::PermissionType permission) {
-    return PermissionDecisionAutoBlocker::RecordIgnore(url, permission,
-                                                       profile_);
+    return autoblocker_->RecordIgnore(url, permission);
   }
 
-  bool ShouldChangeDismissalToBlock(const GURL& url,
+  bool RecordDismissAndEmbargo(const GURL& url,
                                     content::PermissionType permission) {
-    return PermissionDecisionAutoBlocker::ShouldChangeDismissalToBlock(
-        url, permission, profile_);
+    return autoblocker_->RecordDismissAndEmbargo(url, permission,
+                                                 base::Time::Now());
   }
 
  private:
-  TestingProfile* profile_;
+  PermissionDecisionAutoBlocker* autoblocker_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest);
 };
 
 #if BUILDFLAG(ENABLE_PLUGINS)
 // A small modification to MockBrowsingDataFlashLSOHelper so that it responds
 // immediately and does not wait for the Notify() call. Otherwise it would
 // deadlock BrowsingDataRemoverImpl::RemoveImpl.
 class TestBrowsingDataFlashLSOHelper : public MockBrowsingDataFlashLSOHelper {
  public:
@@ skipping 1660 matching lines @@
   filter_builder_2.AddRegisterableDomain(kTestRegisterableDomain1);
 
   {
     // Test REMOVE_HISTORY.
     EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
                                      content::PermissionType::GEOLOCATION));
     EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
                                      content::PermissionType::GEOLOCATION));
     EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
                                      content::PermissionType::NOTIFICATIONS));
-    tester.ShouldChangeDismissalToBlock(kOrigin1,
+    tester.RecordDismissAndEmbargo(kOrigin1,
                                         content::PermissionType::MIDI_SYSEX);

[dominickn, 2017/01/20 04:03:47]

Nit: indentation

[meredithl, 2017/01/20 04:21:33]

Done.

     EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
                                      content::PermissionType::DURABLE_STORAGE));
-    tester.ShouldChangeDismissalToBlock(kOrigin2,
+    tester.RecordDismissAndEmbargo(kOrigin2,

[dominickn, 2017/01/20 04:03:47]

Nit: indentation

[meredithl, 2017/01/20 04:21:33]

Done.

                                         content::PermissionType::NOTIFICATIONS);
 
     BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
                                 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
                                 filter_builder_1);
 
     // kOrigin1 should be gone, but kOrigin2 remains.
     EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
                                        content::PermissionType::GEOLOCATION));
     EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
@@ skipping 21 matching lines @@
                      kOrigin2, content::PermissionType::NOTIFICATIONS));
   }
   {
     // Test REMOVE_SITE_DATA.
     EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
                                      content::PermissionType::GEOLOCATION));
     EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
                                      content::PermissionType::GEOLOCATION));
     EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
                                      content::PermissionType::NOTIFICATIONS));
-    tester.ShouldChangeDismissalToBlock(kOrigin1,
+    tester.RecordDismissAndEmbargo(kOrigin1,

[dominickn, 2017/01/20 04:03:46]

Nit: indentation

[meredithl, 2017/01/20 04:21:33]

Done.

                                         content::PermissionType::MIDI_SYSEX);
     EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
                                      content::PermissionType::DURABLE_STORAGE));
-    tester.ShouldChangeDismissalToBlock(kOrigin2,
+    tester.RecordDismissAndEmbargo(kOrigin2,

[dominickn, 2017/01/20 04:03:47]

Nit: indentation

[meredithl, 2017/01/20 04:21:33]

Done.

                                         content::PermissionType::NOTIFICATIONS);
 
     BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
                                 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
                                 filter_builder_2);
 
     // kOrigin2 should be gone, but kOrigin1 remains.
     EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1,
                                        content::PermissionType::GEOLOCATION));
     EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1,
@@ skipping 302 matching lines @@
   completion_observer.BlockUntilCompletion();
 
   // There should be only 1 recently visited bookmarks.
   std::vector<const bookmarks::BookmarkNode*> remaining_nodes =
       ntp_snippets::GetRecentlyVisitedBookmarks(
           bookmark_model, 3, base::Time::UnixEpoch(),
           /*consider_visits_from_desktop=*/true);
   EXPECT_THAT(remaining_nodes, SizeIs(1));
   EXPECT_THAT(remaining_nodes[0]->url().spec(), Eq("http://foo-2.org/"));
 }