| Index: chrome/common/extensions/permissions/socket_permission.cc
|
| diff --git a/chrome/common/extensions/permissions/socket_permission.cc b/chrome/common/extensions/permissions/socket_permission.cc
|
| index d640cbe6f344bd621365596d72dc61fcc6634f5c..5e8fd644d25674c6829c94b452e2a25f3888ee8b 100644
|
| --- a/chrome/common/extensions/permissions/socket_permission.cc
|
| +++ b/chrome/common/extensions/permissions/socket_permission.cc
|
| @@ -51,7 +51,7 @@ bool SocketPermission::AddAnyHostMessage(PermissionMessages& messages) const {
|
|
|
| void SocketPermission::AddSubdomainHostMessage(
|
| PermissionMessages& messages) const {
|
| - std::set<string16> domains;
|
| + std::set<base::string16> domains;
|
| std::set<SocketPermissionData>::const_iterator i;
|
| for (i = data_set_.begin(); i != data_set_.end(); ++i) {
|
| if (i->entry().GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS)
|
| @@ -66,14 +66,14 @@ void SocketPermission::AddSubdomainHostMessage(
|
| l10n_util::GetStringFUTF16(
|
| id,
|
| JoinString(
|
| - std::vector<string16>(
|
| + std::vector<base::string16>(
|
| domains.begin(), domains.end()), ' '))));
|
| }
|
| }
|
|
|
| void SocketPermission::AddSpecificHostMessage(
|
| PermissionMessages& messages) const {
|
| - std::set<string16> hostnames;
|
| + std::set<base::string16> hostnames;
|
| std::set<SocketPermissionData>::const_iterator i;
|
| for (i = data_set_.begin(); i != data_set_.end(); ++i) {
|
| if (i->entry().GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS)
|
| @@ -88,7 +88,7 @@ void SocketPermission::AddSpecificHostMessage(
|
| l10n_util::GetStringFUTF16(
|
| id,
|
| JoinString(
|
| - std::vector<string16>(
|
| + std::vector<base::string16>(
|
| hostnames.begin(), hostnames.end()), ' '))));
|
| }
|
| }
|
|
|