| Index: content/test/mock_permission_manager.h
|
| diff --git a/content/test/mock_permission_manager.h b/content/test/mock_permission_manager.h
|
| index 6d0f33e3bb5eb0f620abba9e38385de2a07fafbe..d9151b9d96577d1c012ef573eb1f32f4adbc83f2 100644
|
| --- a/content/test/mock_permission_manager.h
|
| +++ b/content/test/mock_permission_manager.h
|
| @@ -23,23 +23,22 @@
|
| ~MockPermissionManager() override;
|
|
|
| // PermissionManager:
|
| - MOCK_METHOD3(
|
| - GetPermissionStatus,
|
| - permissions::mojom::PermissionStatus(PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin));
|
| + MOCK_METHOD3(GetPermissionStatus,
|
| + blink::mojom::PermissionStatus(PermissionType permission,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin));
|
| int RequestPermission(
|
| PermissionType permission,
|
| RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(permissions::mojom::PermissionStatus)>&
|
| - callback) override;
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
|
| + override;
|
| int RequestPermissions(
|
| const std::vector<PermissionType>& permission,
|
| RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(
|
| - const std::vector<permissions::mojom::PermissionStatus>&)>& callback)
|
| + const base::Callback<
|
| + void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
|
| override;
|
| void CancelPermissionRequest(int request_id) override {}
|
| void ResetPermission(PermissionType permission,
|
| @@ -52,8 +51,8 @@
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(permissions::mojom::PermissionStatus)>&
|
| - callback) override;
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
|
| + override;
|
| void UnsubscribePermissionStatusChange(int subscription_id) override {}
|
|
|
| private:
|
|
|