Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 269e78ae1c1c9cee8163b407dcf6b4ca7008d005..3c57a8637c0794e6f5c7d7dec083d0041ad04847 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -2506,19 +2506,18 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI( |
extension_set) { |
const Extension* extension = extension_set->GetByID(url.host()); |
if (extension) { |
+ const extensions::PermissionsData* permissions_data = |
+ extensions::PermissionsData::ForExtension(extension); |
if (params) { |
extensions::SocketPermission::CheckParam check_params( |
params->type, params->host, params->port); |
- if (extensions::PermissionsData::CheckAPIPermissionWithParam( |
- extension, extensions::APIPermission::kSocket, |
- &check_params)) { |
- return true; |
- } |
- } else { |
- if (extensions::PermissionsData::HasAPIPermission( |
- extension, extensions::APIPermission::kSocket)) { |
+ if (permissions_data->CheckAPIPermissionWithParam( |
+ extensions::APIPermission::kSocket, &check_params)) { |
return true; |
} |
+ } else if (permissions_data->HasAPIPermission( |
+ extensions::APIPermission::kSocket)) { |
+ return true; |
} |
} |
} |