| Index: content/test/mock_permission_manager.cc
|
| diff --git a/content/test/mock_permission_manager.cc b/content/test/mock_permission_manager.cc
|
| index 7024cf4d3dfaec935f4e90321048490bd90dbfee..09fb9358b6c6b75358e100f4bfbb3252ab5cb423 100644
|
| --- a/content/test/mock_permission_manager.cc
|
| +++ b/content/test/mock_permission_manager.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "content/test/mock_permission_manager.h"
|
|
|
| -#include "content/public/common/permission_status.mojom.h"
|
| +#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
|
|
|
| namespace content {
|
|
|
| @@ -16,7 +16,7 @@ int MockPermissionManager::RequestPermission(
|
| PermissionType permission,
|
| RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(mojom::PermissionStatus)>& callback) {
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
|
| return kNoPendingOperation;
|
| }
|
|
|
| @@ -24,8 +24,8 @@ int MockPermissionManager::RequestPermissions(
|
| const std::vector<PermissionType>& permission,
|
| RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(const std::vector<mojom::PermissionStatus>&)>&
|
| - callback) {
|
| + const base::Callback<
|
| + void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
|
| return kNoPendingOperation;
|
| }
|
|
|
| @@ -33,7 +33,7 @@ int MockPermissionManager::SubscribePermissionStatusChange(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(mojom::PermissionStatus)>& callback) {
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
|
| // Return a fake subscription_id.
|
| return 0;
|
| }
|
|
|