| Index: extensions/common/permissions/socket_permission.cc | 
| diff --git a/chrome/common/extensions/permissions/socket_permission.cc b/extensions/common/permissions/socket_permission.cc | 
| similarity index 67% | 
| rename from chrome/common/extensions/permissions/socket_permission.cc | 
| rename to extensions/common/permissions/socket_permission.cc | 
| index 6c0812777afba618da09a078ad4bc9498a5a6711..1e78f31b85582f4993ab2642bb0c30952056faa6 100644 | 
| --- a/chrome/common/extensions/permissions/socket_permission.cc | 
| +++ b/extensions/common/permissions/socket_permission.cc | 
| @@ -2,26 +2,24 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
|  | 
| -#include "chrome/common/extensions/permissions/socket_permission.h" | 
| +#include "extensions/common/permissions/socket_permission.h" | 
|  | 
| #include <algorithm> | 
|  | 
| #include "base/logging.h" | 
| #include "base/memory/scoped_ptr.h" | 
| #include "base/strings/utf_string_conversions.h" | 
| -#include "chrome/common/extensions/permissions/set_disjunction_permission.h" | 
| #include "extensions/common/permissions/permissions_info.h" | 
| +#include "extensions/common/permissions/set_disjunction_permission.h" | 
| #include "grit/generated_resources.h" | 
| #include "ui/base/l10n/l10n_util.h" | 
|  | 
| namespace extensions { | 
|  | 
| SocketPermission::SocketPermission(const APIPermissionInfo* info) | 
| -  : SetDisjunctionPermission<SocketPermissionData, SocketPermission>(info) { | 
| -} | 
| +    : SetDisjunctionPermission<SocketPermissionData, SocketPermission>(info) {} | 
|  | 
| -SocketPermission::~SocketPermission() { | 
| -} | 
| +SocketPermission::~SocketPermission() {} | 
|  | 
| PermissionMessages SocketPermission::GetMessages() const { | 
| DCHECK(HasMessages()); | 
| @@ -39,10 +37,10 @@ bool SocketPermission::AddAnyHostMessage(PermissionMessages& messages) const { | 
| for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 
| if (i->entry().IsAddressBoundType() && | 
| i->entry().GetHostType() == SocketPermissionEntry::ANY_HOST) { | 
| -      messages.push_back(PermissionMessage( | 
| -          PermissionMessage::kSocketAnyHost, | 
| -          l10n_util::GetStringUTF16( | 
| -              IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST))); | 
| +      messages.push_back( | 
| +          PermissionMessage(PermissionMessage::kSocketAnyHost, | 
| +                            l10n_util::GetStringUTF16( | 
| +                                IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST))); | 
| return true; | 
| } | 
| } | 
| @@ -58,16 +56,16 @@ void SocketPermission::AddSubdomainHostMessage( | 
| domains.insert(base::UTF8ToUTF16(i->entry().pattern().host)); | 
| } | 
| if (!domains.empty()) { | 
| -    int id = (domains.size() == 1) ? | 
| -             IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN : | 
| -             IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; | 
| +    int id = (domains.size() == 1) | 
| +                 ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN | 
| +                 : IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; | 
| messages.push_back(PermissionMessage( | 
| PermissionMessage::kSocketDomainHosts, | 
| l10n_util::GetStringFUTF16( | 
| id, | 
| JoinString( | 
| -                std::vector<base::string16>( | 
| -                    domains.begin(), domains.end()), ' ')))); | 
| +                std::vector<base::string16>(domains.begin(), domains.end()), | 
| +                ' ')))); | 
| } | 
| } | 
|  | 
| @@ -80,16 +78,16 @@ void SocketPermission::AddSpecificHostMessage( | 
| hostnames.insert(base::UTF8ToUTF16(i->entry().pattern().host)); | 
| } | 
| if (!hostnames.empty()) { | 
| -    int id = (hostnames.size() == 1) ? | 
| -             IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST : | 
| -             IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; | 
| +    int id = (hostnames.size() == 1) | 
| +                 ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST | 
| +                 : IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; | 
| messages.push_back(PermissionMessage( | 
| PermissionMessage::kSocketSpecificHosts, | 
| l10n_util::GetStringFUTF16( | 
| id, | 
| JoinString( | 
| -                std::vector<base::string16>( | 
| -                    hostnames.begin(), hostnames.end()), ' ')))); | 
| +                std::vector<base::string16>(hostnames.begin(), hostnames.end()), | 
| +                ' ')))); | 
| } | 
| } | 
|  | 
| @@ -99,10 +97,10 @@ void SocketPermission::AddNetworkListMessage( | 
| for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 
| if (i->entry().pattern().type == | 
| content::SocketPermissionRequest::NETWORK_STATE) { | 
| -      messages.push_back(PermissionMessage( | 
| -          PermissionMessage::kNetworkState, | 
| -          l10n_util::GetStringUTF16( | 
| -              IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); | 
| +      messages.push_back( | 
| +          PermissionMessage(PermissionMessage::kNetworkState, | 
| +                            l10n_util::GetStringUTF16( | 
| +                                IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); | 
| } | 
| } | 
| } | 
|  |