Index: content/shell/browser/layout_test/layout_test_permission_manager.cc |
diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.cc b/content/shell/browser/layout_test/layout_test_permission_manager.cc |
index 9791db46b02cdce72cc6c00a1f7aa8648bdad5c2..af6edb2d3a613b68668108f1c78f618c63bff789 100644 |
--- a/content/shell/browser/layout_test/layout_test_permission_manager.cc |
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc |
@@ -18,8 +18,8 @@ namespace content { |
struct LayoutTestPermissionManager::Subscription { |
PermissionDescription permission; |
- base::Callback<void(content::PermissionStatus)> callback; |
- PermissionStatus current_value; |
+ base::Callback<void(permission::Status)> callback; |
+ permission::Status current_value; |
}; |
LayoutTestPermissionManager::PermissionDescription::PermissionDescription( |
@@ -66,7 +66,7 @@ int LayoutTestPermissionManager::RequestPermission( |
RenderFrameHost* render_frame_host, |
const GURL& requesting_origin, |
bool user_gesture, |
- const base::Callback<void(PermissionStatus)>& callback) { |
+ const base::Callback<void(permission::Status)>& callback) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
callback.Run(GetPermissionStatus( |
@@ -95,7 +95,7 @@ void LayoutTestPermissionManager::ResetPermission( |
permissions_.erase(it);; |
} |
-PermissionStatus LayoutTestPermissionManager::GetPermissionStatus( |
+permission::Status LayoutTestPermissionManager::GetPermissionStatus( |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin) { |
@@ -107,7 +107,7 @@ PermissionStatus LayoutTestPermissionManager::GetPermissionStatus( |
auto it = permissions_.find( |
PermissionDescription(permission, requesting_origin, embedding_origin)); |
if (it == permissions_.end()) |
- return PERMISSION_STATUS_DENIED; |
+ return permission::STATUS_DENIED; |
return it->second; |
} |
@@ -122,7 +122,7 @@ int LayoutTestPermissionManager::SubscribePermissionStatusChange( |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |
- const base::Callback<void(PermissionStatus)>& callback) { |
+ const base::Callback<void(permission::Status)>& callback) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
Subscription* subscription = new Subscription(); |
@@ -146,7 +146,7 @@ void LayoutTestPermissionManager::UnsubscribePermissionStatusChange( |
} |
void LayoutTestPermissionManager::SetPermission(PermissionType permission, |
- PermissionStatus status, |
+ permission::Status status, |
const GURL& origin, |
const GURL& embedding_origin) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
@@ -157,7 +157,7 @@ void LayoutTestPermissionManager::SetPermission(PermissionType permission, |
auto it = permissions_.find(description); |
if (it == permissions_.end()) { |
- permissions_.insert(std::pair<PermissionDescription, PermissionStatus>( |
+ permissions_.insert(std::pair<PermissionDescription, permission::Status>( |
description, status)); |
} else { |
it->second = status; |
@@ -175,7 +175,7 @@ void LayoutTestPermissionManager::ResetPermissions() { |
void LayoutTestPermissionManager::OnPermissionChanged( |
const PermissionDescription& permission, |
- PermissionStatus status) { |
+ permission::Status status) { |
std::list<base::Closure> callbacks; |
for (SubscriptionsMap::iterator iter(&subscriptions_); |