| Index: net/base/address_list.h
|
| diff --git a/net/base/address_list.h b/net/base/address_list.h
|
| index 1487e11c306919f90f7590a3418ade24a6f38649..25463d8783ecd57c34acb23a736218779e75ad24 100644
|
| --- a/net/base/address_list.h
|
| +++ b/net/base/address_list.h
|
| @@ -31,9 +31,8 @@ class NET_EXPORT AddressList
|
| static AddressList CreateFromIPAddress(const IPAddressNumber& address,
|
| uint16 port);
|
|
|
| - static AddressList CreateFromIPAddressList(
|
| - const IPAddressList& addresses,
|
| - const std::string& canonical_name);
|
| + static AddressList CreateFromIPAddressList(const IPAddressList& addresses,
|
| + const std::string& canonical_name);
|
|
|
| // Copies the data from |head| and the chained list into an AddressList.
|
| static AddressList CreateFromAddrinfo(const struct addrinfo* head);
|
| @@ -42,9 +41,7 @@ class NET_EXPORT AddressList
|
| static AddressList CopyWithPort(const AddressList& list, uint16 port);
|
|
|
| // TODO(szym): Remove all three. http://crbug.com/126134
|
| - const std::string& canonical_name() const {
|
| - return canonical_name_;
|
| - }
|
| + const std::string& canonical_name() const { return canonical_name_; }
|
|
|
| void set_canonical_name(const std::string& canonical_name) {
|
| canonical_name_ = canonical_name;
|
|
|