Index: net/base/host_port_pair.cc |
diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc |
index 816bbac9b1f875ed83a19d783dbf6efba74b2ecc..cd56089ec20903e72a58b634807a7e812b693dbd 100644 |
--- a/net/base/host_port_pair.cc |
+++ b/net/base/host_port_pair.cc |
@@ -32,8 +32,8 @@ HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) { |
} |
HostPortPair HostPortPair::FromString(const std::string& str) { |
- std::vector<std::string> key_port; |
- base::SplitString(str, ':', &key_port); |
+ std::vector<base::StringPiece> key_port = base::SplitStringPiece( |
+ str, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
if (key_port.size() != 2) |
return HostPortPair(); |
int port; |
@@ -42,7 +42,7 @@ HostPortPair HostPortPair::FromString(const std::string& str) { |
if (!IsPortValid(port)) |
return HostPortPair(); |
HostPortPair host_port_pair; |
- host_port_pair.set_host(key_port[0]); |
+ host_port_pair.set_host(key_port[0].as_string()); |
host_port_pair.set_port(static_cast<uint16_t>(port)); |
return host_port_pair; |
} |