| Index: net/base/host_port_pair.cc
|
| diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc
|
| index 6675692123a58a26091fdd8b1a290c139185fc7c..a8a0cc652aff7686db0ebb0e3bcc8fe8146f4e70 100644
|
| --- a/net/base/host_port_pair.cc
|
| +++ b/net/base/host_port_pair.cc
|
| @@ -20,7 +20,8 @@ HostPortPair::HostPortPair(const std::string& in_host, uint16 in_port)
|
|
|
| // static
|
| HostPortPair HostPortPair::FromURL(const GURL& url) {
|
| - return HostPortPair(url.HostNoBrackets(), url.EffectiveIntPort());
|
| + return HostPortPair(url.HostNoBrackets(),
|
| + static_cast<uint16>(url.EffectiveIntPort()));
|
| }
|
|
|
| // static
|
| @@ -39,7 +40,7 @@ HostPortPair HostPortPair::FromString(const std::string& str) {
|
| DCHECK_LT(port, 1 << 16);
|
| HostPortPair host_port_pair;
|
| host_port_pair.set_host(key_port[0]);
|
| - host_port_pair.set_port(port);
|
| + host_port_pair.set_port(static_cast<uint16>(port));
|
| return host_port_pair;
|
| }
|
|
|
|
|