| Index: net/base/host_port_pair.cc
|
| diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc
|
| index 1550c36f616c258da2fd6c76cf996087ee355042..816bbac9b1f875ed83a19d783dbf6efba74b2ecc 100644
|
| --- a/net/base/host_port_pair.cc
|
| +++ b/net/base/host_port_pair.cc
|
| @@ -16,13 +16,14 @@
|
| namespace net {
|
|
|
| HostPortPair::HostPortPair() : port_(0) {}
|
| -HostPortPair::HostPortPair(const std::string& in_host, uint16 in_port)
|
| - : host_(in_host), port_(in_port) {}
|
| +HostPortPair::HostPortPair(const std::string& in_host, uint16_t in_port)
|
| + : host_(in_host), port_(in_port) {
|
| +}
|
|
|
| // static
|
| HostPortPair HostPortPair::FromURL(const GURL& url) {
|
| return HostPortPair(url.HostNoBrackets(),
|
| - static_cast<uint16>(url.EffectiveIntPort()));
|
| + static_cast<uint16_t>(url.EffectiveIntPort()));
|
| }
|
|
|
| // static
|
| @@ -42,7 +43,7 @@ HostPortPair HostPortPair::FromString(const std::string& str) {
|
| return HostPortPair();
|
| HostPortPair host_port_pair;
|
| host_port_pair.set_host(key_port[0]);
|
| - host_port_pair.set_port(static_cast<uint16>(port));
|
| + host_port_pair.set_port(static_cast<uint16_t>(port));
|
| return host_port_pair;
|
| }
|
|
|
|
|