| Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
|
| diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
|
| index 69d02d232958ea65f04f0b736dc8af5a50374185..b6a62d32732a49983048073db6c913fe91ca5a7a 100644
|
| --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
|
| +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
|
| @@ -28,6 +28,7 @@
|
| #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"
|
| @@ -1057,32 +1058,30 @@ class 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,
|
| - content::PermissionType permission) {
|
| - return PermissionDecisionAutoBlocker::ShouldChangeDismissalToBlock(
|
| - url, permission, profile_);
|
| + bool RecordDismissAndEmbargo(const GURL& url,
|
| + content::PermissionType permission) {
|
| + return autoblocker_->RecordDismissAndEmbargo(url, permission,
|
| + base::Time::Now());
|
| }
|
|
|
| private:
|
| - TestingProfile* profile_;
|
| + PermissionDecisionAutoBlocker* autoblocker_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest);
|
| };
|
| @@ -2763,12 +2762,12 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
|
| content::PermissionType::GEOLOCATION));
|
| EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
|
| content::PermissionType::NOTIFICATIONS));
|
| - tester.ShouldChangeDismissalToBlock(kOrigin1,
|
| - content::PermissionType::MIDI_SYSEX);
|
| + tester.RecordDismissAndEmbargo(kOrigin1,
|
| + content::PermissionType::MIDI_SYSEX);
|
| EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
|
| content::PermissionType::DURABLE_STORAGE));
|
| - tester.ShouldChangeDismissalToBlock(kOrigin2,
|
| - content::PermissionType::NOTIFICATIONS);
|
| + tester.RecordDismissAndEmbargo(kOrigin2,
|
| + content::PermissionType::NOTIFICATIONS);
|
|
|
| BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
|
| BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
|
| @@ -2809,12 +2808,12 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
|
| content::PermissionType::GEOLOCATION));
|
| EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
|
| content::PermissionType::NOTIFICATIONS));
|
| - tester.ShouldChangeDismissalToBlock(kOrigin1,
|
| - content::PermissionType::MIDI_SYSEX);
|
| + tester.RecordDismissAndEmbargo(kOrigin1,
|
| + content::PermissionType::MIDI_SYSEX);
|
| EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
|
| content::PermissionType::DURABLE_STORAGE));
|
| - tester.ShouldChangeDismissalToBlock(kOrigin2,
|
| - content::PermissionType::NOTIFICATIONS);
|
| + tester.RecordDismissAndEmbargo(kOrigin2,
|
| + content::PermissionType::NOTIFICATIONS);
|
|
|
| BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
|
| BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
|
|
|