Index: content/shell/browser/layout_test/layout_test_permission_manager.h |
diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.h b/content/shell/browser/layout_test/layout_test_permission_manager.h |
index 3ec4a8f8c39b891070546145a75a66d2bbbb0a7e..07fae0698fe92f292279f4b03a46a5657f563709 100644 |
--- a/content/shell/browser/layout_test/layout_test_permission_manager.h |
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.h |
@@ -27,20 +27,20 @@ |
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, |
const GURL& requesting_origin, |
const GURL& embedding_origin) override; |
- permissions::mojom::PermissionStatus GetPermissionStatus( |
+ blink::mojom::PermissionStatus GetPermissionStatus( |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin) override; |
@@ -51,12 +51,12 @@ |
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; |
void SetPermission(PermissionType permission, |
- permissions::mojom::PermissionStatus status, |
+ blink::mojom::PermissionStatus status, |
const GURL& origin, |
const GURL& embedding_origin); |
void ResetPermissions(); |
@@ -84,11 +84,11 @@ |
struct Subscription; |
using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>; |
using PermissionsMap = base::hash_map<PermissionDescription, |
- permissions::mojom::PermissionStatus, |
+ blink::mojom::PermissionStatus, |
PermissionDescription::Hash>; |
void OnPermissionChanged(const PermissionDescription& permission, |
- permissions::mojom::PermissionStatus status); |
+ blink::mojom::PermissionStatus status); |
// Mutex for permissions access. Unfortunately, the permissions can be |
// accessed from the IO thread because of Notifications' synchronous IPC. |