Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Unified Diff: chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Issue 2640033006: Convert AutoBlocker static class to KeyedService. (Closed)
Patch Set: Remove ShouldChangeDismissalToBlock Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..4994749c63f3264c73a4149e4ca9787e74924094 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,
+ 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);
};
@@ -2763,11 +2762,11 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
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(),
@@ -2809,11 +2808,11 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
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(),

Powered by Google App Engine
This is Rietveld 408576698