| Index: extensions/common/permissions/socket_permission_entry.cc
|
| diff --git a/extensions/common/permissions/socket_permission_entry.cc b/extensions/common/permissions/socket_permission_entry.cc
|
| index 86c61de043f5e651303a35567a2d381c9cb0263a..8b2d355acc70a80e4d0413c77fb62a989350fb5f 100644
|
| --- a/extensions/common/permissions/socket_permission_entry.cc
|
| +++ b/extensions/common/permissions/socket_permission_entry.cc
|
| @@ -128,9 +128,8 @@
|
| SocketPermissionRequest::OperationType type,
|
| const std::string& pattern,
|
| SocketPermissionEntry* entry) {
|
| - std::vector<std::string> tokens =
|
| - base::SplitString(pattern, std::string(1, kColon), base::KEEP_WHITESPACE,
|
| - base::SPLIT_WANT_ALL);
|
| + std::vector<std::string> tokens;
|
| + base::SplitStringDontTrim(pattern, kColon, &tokens);
|
| return ParseHostPattern(type, tokens, entry);
|
| }
|
|
|
| @@ -169,9 +168,8 @@
|
| result.pattern_.host = base::StringToLowerASCII(result.pattern_.host);
|
|
|
| // The first component can optionally be '*' to match all subdomains.
|
| - std::vector<std::string> host_components =
|
| - base::SplitString(result.pattern_.host, std::string(1, kDot),
|
| - base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
|
| + std::vector<std::string> host_components;
|
| + base::SplitString(result.pattern_.host, kDot, &host_components);
|
| DCHECK(!host_components.empty());
|
|
|
| if (host_components[0] == kWildcard || host_components[0].empty()) {
|
|
|