| 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 1bd14b9fe2a5ec001d8ef7d527ee359295c40291..0c8f73371a16eb251f6c77c5b9605fa8b99053f1 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -2507,19 +2507,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;
|
| }
|
| }
|
| }
|
|
|