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

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

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 e59c98d357cdaa48e8b2ebae0fedb13886511cec..0b0997956018b08a46f52887036866fab9a1adcb 100644
--- a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
+++ b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
@@ -23,13 +23,13 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/permissions/permission_status.mojom.h"
#include "content/public/browser/permission_type.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "net/base/filename_util.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
#include "ui/base/l10n/l10n_util.h"
// -----------------------------------------------------------------------------
@@ -404,13 +404,13 @@
PermissionManager* permission_manager =
PermissionManager::Get(browser()->profile());
- EXPECT_EQ(permissions::mojom::PermissionStatus::ASK,
+ EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
permission_manager->GetPermissionStatus(
content::PermissionType::NOTIFICATIONS, TestPageUrl(),
TestPageUrl()));
RequestAndAcceptPermission();
- EXPECT_EQ(permissions::mojom::PermissionStatus::GRANTED,
+ EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED,
permission_manager->GetPermissionStatus(
content::PermissionType::NOTIFICATIONS, TestPageUrl(),
TestPageUrl()));
@@ -424,12 +424,12 @@
ui_test_utils::NavigateToURL(browser(), file_url);
- EXPECT_EQ(permissions::mojom::PermissionStatus::ASK,
+ EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
permission_manager->GetPermissionStatus(
content::PermissionType::NOTIFICATIONS, file_url, file_url));
RequestAndAcceptPermission();
- EXPECT_EQ(permissions::mojom::PermissionStatus::ASK,
+ EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
permission_manager->GetPermissionStatus(
content::PermissionType::NOTIFICATIONS, file_url, file_url))
<< "If this test fails, you may have fixed a bug preventing file origins "

Powered by Google App Engine
This is Rietveld 408576698