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

Unified Diff: chrome/browser/permissions/permission_context_base_unittest.cc

Issue 2171503003: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-push-content-setting-2
Patch Set: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING Created 4 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/permissions/permission_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_context_base_unittest.cc
diff --git a/chrome/browser/permissions/permission_context_base_unittest.cc b/chrome/browser/permissions/permission_context_base_unittest.cc
index 13a1f34ae959c13cc1fbf97f6ee3332ea158082f..615d6eda01d7c7a71e6b7de7439d336f68cae94e 100644
--- a/chrome/browser/permissions/permission_context_base_unittest.cc
+++ b/chrome/browser/permissions/permission_context_base_unittest.cc
@@ -342,7 +342,7 @@ TEST_F(PermissionContextBaseTests, TestNonValidRequestingUrl) {
TestRequestPermissionInvalidUrl(content::PermissionType::MIDI_SYSEX,
CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
TestRequestPermissionInvalidUrl(content::PermissionType::PUSH_MESSAGING,
- CONTENT_SETTINGS_TYPE_PUSH_MESSAGING);
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
TestRequestPermissionInvalidUrl(
content::PermissionType::PROTECTED_MEDIA_IDENTIFIER,
@@ -365,9 +365,6 @@ TEST_F(PermissionContextBaseTests, TestGrantAndRevokeWithInfobars) {
// TODO(timvolodine): currently no test for
// CONTENT_SETTINGS_TYPE_NOTIFICATIONS because notification permissions work
// differently with infobars as compared to bubbles (crbug.com/453784).
- // TODO(timvolodine): currently no test for
- // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING because infobars do not implement push
- // messaging permissions (crbug.com/453788).
}
#endif
@@ -387,7 +384,7 @@ TEST_F(PermissionContextBaseTests, TestGrantAndRevokeWithBubbles) {
CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
CONTENT_SETTING_ASK);
TestGrantAndRevoke_TestContent(content::PermissionType::PUSH_MESSAGING,
- CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
CONTENT_SETTING_ASK);
}
#endif
@@ -401,7 +398,7 @@ TEST_F(PermissionContextBaseTests, TestGlobalKillSwitch) {
TestGlobalPermissionsKillSwitch(content::PermissionType::MIDI_SYSEX,
CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
TestGlobalPermissionsKillSwitch(content::PermissionType::PUSH_MESSAGING,
- CONTENT_SETTINGS_TYPE_PUSH_MESSAGING);
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
TestGlobalPermissionsKillSwitch(content::PermissionType::DURABLE_STORAGE,
CONTENT_SETTINGS_TYPE_DURABLE_STORAGE);
#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
« no previous file with comments | « no previous file | chrome/browser/permissions/permission_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698