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 b7fba5260b8b394d39bc2ed8ba2c07ae59e1ccfa..b2c305c88799e80626b74cf4ff0b7f7acfdd5d6d 100644 |
--- a/content/shell/browser/layout_test/layout_test_permission_manager.h |
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.h |
@@ -26,14 +26,14 @@ class LayoutTestPermissionManager : public PermissionManager { |
RenderFrameHost* render_frame_host, |
const GURL& requesting_origin, |
bool user_gesture, |
- const base::Callback<void(PermissionStatus)>& callback) override; |
+ const base::Callback<void(permission::Status)>& callback) override; |
void CancelPermissionRequest(int request_id) override; |
void ResetPermission(PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin) override; |
- PermissionStatus GetPermissionStatus(PermissionType permission, |
- const GURL& requesting_origin, |
- const GURL& embedding_origin) override; |
+ permission::Status GetPermissionStatus(PermissionType permission, |
+ const GURL& requesting_origin, |
+ const GURL& embedding_origin) override; |
void RegisterPermissionUsage(PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin) override; |
@@ -41,11 +41,11 @@ class LayoutTestPermissionManager : public PermissionManager { |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |
- const base::Callback<void(PermissionStatus)>& callback) override; |
+ const base::Callback<void(permission::Status)>& callback) override; |
void UnsubscribePermissionStatusChange(int subscription_id) override; |
void SetPermission(PermissionType permission, |
- PermissionStatus status, |
+ permission::Status status, |
const GURL& origin, |
const GURL& embedding_origin); |
void ResetPermissions(); |
@@ -73,18 +73,18 @@ class LayoutTestPermissionManager : public PermissionManager { |
struct Subscription; |
using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>; |
using PermissionsMap = base::hash_map<PermissionDescription, |
- PermissionStatus, |
+ permission::Status, |
PermissionDescription::Hash>; |
void OnPermissionChanged(const PermissionDescription& permission, |
- PermissionStatus status); |
+ permission::Status status); |
// Mutex for permissions access. Unfortunately, the permissions can be |
// accessed from the IO thread because of Notifications' synchronous IPC. |
base::Lock permissions_lock_; |
// List of permissions currently known by the LayoutTestPermissionManager and |
- // their associated |PermissionStatus|. |
+ // their associated |permission::Status|. |
PermissionsMap permissions_; |
// List of subscribers currently listening to permission changes. |