| Index: chrome/common/extensions/permissions/chrome_permission_message_rules.cc
|
| diff --git a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
|
| index 1083cff21f2bc1526745c6352caf1351b9b7e2af..7b68bfaab97fd03fa5aa5c54c4759757fef72642 100644
|
| --- a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
|
| +++ b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/stl_util.h"
|
| #include "base/strings/string_util.h"
|
| -#include "base/strings/utf_string_conversions.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "extensions/common/permissions/api_permission_set.h"
|
| #include "extensions/common/permissions/coalesced_permission_message.h"
|
| @@ -99,8 +98,8 @@
|
| DCHECK(permissions.size() > 0);
|
| std::vector<base::string16> hostnames =
|
| permissions.GetAllPermissionParameters();
|
| - base::string16 hosts_string =
|
| - base::JoinString(hostnames, base::ASCIIToUTF16(" "));
|
| + base::string16 hosts_string = JoinString(
|
| + std::vector<base::string16>(hostnames.begin(), hostnames.end()), ' ');
|
| return CoalescedPermissionMessage(
|
| l10n_util::GetStringFUTF16(hostnames.size() == 1
|
| ? message_id_for_one_host_
|
|
|