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

Unified Diff: chrome/browser/notifications/desktop_notification_service_unittest.cc

Issue 61323002: Fix broken threading model in CheckDesktopNotificationPermission (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Even more merge conflicts.. Created 7 years, 1 month 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/notifications/desktop_notification_service_unittest.cc
diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_service_unittest.cc
index adcbb841bd27f282210be2da6247002e224486d4..3fcf7e75b95d7c63ca881e6300d6778dd78693ef 100644
--- a/chrome/browser/notifications/desktop_notification_service_unittest.cc
+++ b/chrome/browser/notifications/desktop_notification_service_unittest.cc
@@ -27,43 +27,6 @@ class DesktopNotificationServiceTest : public ChromeRenderViewHostTestHarness {
DesktopNotificationService* service_;
};
-TEST_F(DesktopNotificationServiceTest, SettingsForSchemes) {
- GURL url("file:///html/test.html");
-
- EXPECT_EQ(CONTENT_SETTING_ASK,
- service_->GetDefaultContentSetting(NULL));
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionNotAllowed,
- service_->HasPermission(url));
-
- service_->GrantPermission(url);
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionAllowed,
- service_->HasPermission(url));
-
- service_->DenyPermission(url);
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionDenied,
- service_->HasPermission(url));
-
- GURL https_url("https://testurl");
- GURL http_url("http://testurl");
- EXPECT_EQ(CONTENT_SETTING_ASK,
- service_->GetDefaultContentSetting(NULL));
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionNotAllowed,
- service_->HasPermission(http_url));
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionNotAllowed,
- service_->HasPermission(https_url));
-
- service_->GrantPermission(https_url);
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionNotAllowed,
- service_->HasPermission(http_url));
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionAllowed,
- service_->HasPermission(https_url));
-
- service_->DenyPermission(http_url);
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionDenied,
- service_->HasPermission(http_url));
- EXPECT_EQ(blink::WebNotificationPresenter::PermissionAllowed,
- service_->HasPermission(https_url));
-}
TEST_F(DesktopNotificationServiceTest, GetNotificationsSettings) {
service_->GrantPermission(GURL("http://allowed2.com"));
« no previous file with comments | « chrome/browser/notifications/desktop_notification_service.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698