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

Unified Diff: content/browser/background_sync/background_sync_manager_unittest.cc

Issue 1942353002: (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, 8 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: content/browser/background_sync/background_sync_manager_unittest.cc
diff --git a/content/browser/background_sync/background_sync_manager_unittest.cc b/content/browser/background_sync/background_sync_manager_unittest.cc
index 2ef0f0b45848df5969b10ae2fe4d55feaa3f3c3d..0ec5b2774d19944494031bc3c60a53c3dbfecea8 100644
--- a/content/browser/background_sync/background_sync_manager_unittest.cc
+++ b/content/browser/background_sync/background_sync_manager_unittest.cc
@@ -20,6 +20,7 @@
#include "base/test/mock_entropy_provider.h"
#include "base/test/simple_test_clock.h"
#include "base/thread_task_runner_handle.h"
+#include "components/permissions/permission_status.mojom.h"
#include "content/browser/background_sync/background_sync_network_observer.h"
#include "content/browser/background_sync/background_sync_status.h"
#include "content/browser/browser_thread_impl.h"
@@ -39,7 +40,6 @@
#include "net/base/network_change_notifier.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
namespace content {
@@ -129,7 +129,7 @@ class BackgroundSyncManagerTest : public testing::Test {
new testing::NiceMock<MockPermissionManager>());
ON_CALL(*mock_permission_manager,
GetPermissionStatus(PermissionType::BACKGROUND_SYNC, _, _))
- .WillByDefault(Return(blink::mojom::PermissionStatus::GRANTED));
+ .WillByDefault(Return(permissions::mojom::PermissionStatus::GRANTED));
helper_->browser_context()->SetPermissionManager(
std::move(mock_permission_manager));
@@ -472,7 +472,7 @@ TEST_F(BackgroundSyncManagerTest, RegisterPermissionDenied) {
EXPECT_CALL(*mock_permission_manager,
GetPermissionStatus(PermissionType::BACKGROUND_SYNC,
expected_origin, expected_origin))
- .WillOnce(testing::Return(blink::mojom::PermissionStatus::DENIED));
+ .WillOnce(testing::Return(permissions::mojom::PermissionStatus::DENIED));
EXPECT_FALSE(Register(sync_options_1_));
}
@@ -483,7 +483,7 @@ TEST_F(BackgroundSyncManagerTest, RegisterPermissionGranted) {
EXPECT_CALL(*mock_permission_manager,
GetPermissionStatus(PermissionType::BACKGROUND_SYNC,
expected_origin, expected_origin))
- .WillOnce(testing::Return(blink::mojom::PermissionStatus::GRANTED));
+ .WillOnce(testing::Return(permissions::mojom::PermissionStatus::GRANTED));
EXPECT_TRUE(Register(sync_options_1_));
}

Powered by Google App Engine
This is Rietveld 408576698