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

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

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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/notifications/platform_notification_service_interactive_uitest.cc
diff --git a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
index 88f3984ab24b2d60305b35b7632e8ce818010074..f99ba225cd845fe62d10522596e8b8d3035b3139 100644
--- a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
+++ b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
@@ -31,7 +31,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/browser/permission_type.h"
+#include "components/content_settings/core/common/content_settings_types.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
@@ -164,7 +164,7 @@ void PlatformNotificationServiceBrowserTest::
DesktopNotificationProfileUtil::GrantPermission(browser()->profile(), origin);
ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED,
PermissionManager::Get(browser()->profile())
- ->GetPermissionStatus(content::PermissionType::NOTIFICATIONS,
+ ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
origin, origin));
}
@@ -471,13 +471,13 @@ IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
permission_manager->GetPermissionStatus(
- content::PermissionType::NOTIFICATIONS, TestPageUrl(),
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(),
TestPageUrl()));
RequestAndAcceptPermission();
EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED,
permission_manager->GetPermissionStatus(
- content::PermissionType::NOTIFICATIONS, TestPageUrl(),
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(),
TestPageUrl()));
// This case should fail because a file URL is used.
@@ -491,12 +491,12 @@ IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
permission_manager->GetPermissionStatus(
- content::PermissionType::NOTIFICATIONS, file_url, file_url));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, file_url, file_url));
RequestAndAcceptPermission();
EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
permission_manager->GetPermissionStatus(
- content::PermissionType::NOTIFICATIONS, file_url, file_url))
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, file_url, file_url))
<< "If this test fails, you may have fixed a bug preventing file origins "
<< "from sending their origin from Blink; if so you need to update the "
<< "display function for notification origins to show the file path.";
« no previous file with comments | « chrome/browser/notifications/platform_notification_service_impl.cc ('k') | chrome/browser/permissions/delegation_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698