Index: net/base/net_util.h |
diff --git a/net/base/net_util.h b/net/base/net_util.h |
index d83744fb596dfae3c293a16b3288e8bd93d587e3..6278ae121cf300a093fedbd5577163088a570fe3 100644 |
--- a/net/base/net_util.h |
+++ b/net/base/net_util.h |
@@ -88,10 +88,9 @@ NET_EXPORT bool ParseHostAndPort( |
std::string::const_iterator host_and_port_end, |
std::string* host, |
int* port); |
-NET_EXPORT bool ParseHostAndPort( |
- const std::string& host_and_port, |
- std::string* host, |
- int* port); |
+NET_EXPORT bool ParseHostAndPort(const std::string& host_and_port, |
+ std::string* host, |
+ int* port); |
// Returns a host:port string for the given URL. |
NET_EXPORT std::string GetHostAndPort(const GURL& url); |
@@ -112,8 +111,9 @@ NET_EXPORT bool IsIPAddressReserved(const IPAddressNumber& address); |
// Convenience struct for when you need a |struct sockaddr|. |
struct SockaddrStorage { |
- SockaddrStorage() : addr_len(sizeof(addr_storage)), |
- addr(reinterpret_cast<struct sockaddr*>(&addr_storage)) {} |
+ SockaddrStorage() |
+ : addr_len(sizeof(addr_storage)), |
+ addr(reinterpret_cast<struct sockaddr*>(&addr_storage)) {} |
struct sockaddr_storage addr_storage; |
socklen_t addr_len; |
struct sockaddr* const addr; |
@@ -152,8 +152,8 @@ NET_EXPORT std::string NetAddressToStringWithPort(const struct sockaddr* sa, |
NET_EXPORT std::string IPAddressToString(const IPAddressNumber& addr); |
// Same as IPAddressToStringWithPort() but for an IPAddressNumber. |
-NET_EXPORT std::string IPAddressToStringWithPort( |
- const IPAddressNumber& addr, uint16 port); |
+NET_EXPORT std::string IPAddressToStringWithPort(const IPAddressNumber& addr, |
+ uint16 port); |
// Returns the address as a sequence of bytes in network-byte-order. |
NET_EXPORT std::string IPAddressToPackedString(const IPAddressNumber& addr); |
@@ -236,7 +236,8 @@ NET_EXPORT std::string GetDirectoryListingHeader(const base::string16& title); |
// Both |name| and |raw_bytes| are escaped internally. |
NET_EXPORT std::string GetDirectoryListingEntry(const base::string16& name, |
const std::string& raw_bytes, |
- bool is_dir, int64 size, |
+ bool is_dir, |
+ int64 size, |
base::Time modified); |
// If text starts with "www." it is removed, otherwise text is returned |
@@ -331,8 +332,13 @@ NET_EXPORT base::string16 FormatUrlWithAdjustments( |
// set of flags for "URLs to display to the user". You should be cautious about |
// using this for URLs which will be parsed or sent to other applications. |
inline base::string16 FormatUrl(const GURL& url, const std::string& languages) { |
- return FormatUrl(url, languages, kFormatUrlOmitAll, UnescapeRule::SPACES, |
- NULL, NULL, NULL); |
+ return FormatUrl(url, |
+ languages, |
+ kFormatUrlOmitAll, |
+ UnescapeRule::SPACES, |
+ NULL, |
+ NULL, |
+ NULL); |
} |
// Returns whether FormatUrl() would strip a trailing slash from |url|, given a |
@@ -363,8 +369,8 @@ class NET_EXPORT ScopedPortException { |
bool HaveOnlyLoopbackAddresses(); |
// Returns AddressFamily of the address. |
-NET_EXPORT_PRIVATE AddressFamily GetAddressFamily( |
- const IPAddressNumber& address); |
+NET_EXPORT_PRIVATE AddressFamily |
+ GetAddressFamily(const IPAddressNumber& address); |
// Maps the given AddressFamily to either AF_INET, AF_INET6 or AF_UNSPEC. |
NET_EXPORT_PRIVATE int ConvertAddressFamily(AddressFamily address_family); |
@@ -376,16 +382,16 @@ NET_EXPORT_PRIVATE bool ParseIPLiteralToNumber(const std::string& ip_literal, |
// Converts an IPv4 address to an IPv4-mapped IPv6 address. |
// For example 192.168.0.1 would be converted to ::ffff:192.168.0.1. |
-NET_EXPORT_PRIVATE IPAddressNumber ConvertIPv4NumberToIPv6Number( |
- const IPAddressNumber& ipv4_number); |
+NET_EXPORT_PRIVATE IPAddressNumber |
+ ConvertIPv4NumberToIPv6Number(const IPAddressNumber& ipv4_number); |
// Returns true iff |address| is an IPv4-mapped IPv6 address. |
NET_EXPORT_PRIVATE bool IsIPv4Mapped(const IPAddressNumber& address); |
// Converts an IPv4-mapped IPv6 address to IPv4 address. Should only be called |
// on IPv4-mapped IPv6 addresses. |
-NET_EXPORT_PRIVATE IPAddressNumber ConvertIPv4MappedToIPv4( |
- const IPAddressNumber& address); |
+NET_EXPORT_PRIVATE IPAddressNumber |
+ ConvertIPv4MappedToIPv4(const IPAddressNumber& address); |
// Parses an IP block specifier from CIDR notation to an |
// (IP address, prefix length) pair. Returns true on success and fills |
@@ -444,7 +450,7 @@ struct NET_EXPORT NetworkInterface { |
std::string name; |
std::string friendly_name; // Same as |name| on non-Windows. |
- uint32 interface_index; // Always 0 on Android. |
+ uint32 interface_index; // Always 0 on Android. |
NetworkChangeNotifier::ConnectionType type; |
IPAddressNumber address; |
size_t network_prefix; |
@@ -454,19 +460,18 @@ typedef std::vector<NetworkInterface> NetworkInterfaceList; |
// Policy settings to include/exclude network interfaces. |
enum HostAddressSelectionPolicy { |
- INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES = 0x0, |
- EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES = 0x1, |
+ INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES = 0x0, |
+ EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES = 0x1, |
// Include temp address only when interface has both permanent and |
// temp addresses. |
- INCLUDE_ONLY_TEMP_IPV6_ADDRESS_IF_POSSIBLE = 0x2, |
+ INCLUDE_ONLY_TEMP_IPV6_ADDRESS_IF_POSSIBLE = 0x2, |
}; |
// Returns list of network interfaces except loopback interface. If an |
// interface has more than one address, a separate entry is added to |
// the list for each address. |
// Can be called only on a thread that allows IO. |
-NET_EXPORT bool GetNetworkList(NetworkInterfaceList* networks, |
- int policy); |
+NET_EXPORT bool GetNetworkList(NetworkInterfaceList* networks, int policy); |
// General category of the IEEE 802.11 (wifi) physical layer operating mode. |
enum WifiPHYLayerProtocol { |
@@ -503,27 +508,27 @@ enum DiffServCodePoint { |
DSCP_NO_CHANGE = -1, |
DSCP_FIRST = DSCP_NO_CHANGE, |
DSCP_DEFAULT = 0, // Same as DSCP_CS0 |
- DSCP_CS0 = 0, // The default |
- DSCP_CS1 = 8, // Bulk/background traffic |
+ DSCP_CS0 = 0, // The default |
+ DSCP_CS1 = 8, // Bulk/background traffic |
DSCP_AF11 = 10, |
DSCP_AF12 = 12, |
DSCP_AF13 = 14, |
- DSCP_CS2 = 16, |
+ DSCP_CS2 = 16, |
DSCP_AF21 = 18, |
DSCP_AF22 = 20, |
DSCP_AF23 = 22, |
- DSCP_CS3 = 24, |
+ DSCP_CS3 = 24, |
DSCP_AF31 = 26, |
DSCP_AF32 = 28, |
DSCP_AF33 = 30, |
- DSCP_CS4 = 32, |
+ DSCP_CS4 = 32, |
DSCP_AF41 = 34, // Video |
DSCP_AF42 = 36, // Video |
DSCP_AF43 = 38, // Video |
- DSCP_CS5 = 40, // Video |
- DSCP_EF = 46, // Voice |
- DSCP_CS6 = 48, // Voice |
- DSCP_CS7 = 56, // Control messages |
+ DSCP_CS5 = 40, // Video |
+ DSCP_EF = 46, // Voice |
+ DSCP_CS6 = 48, // Voice |
+ DSCP_CS7 = 56, // Control messages |
DSCP_LAST = DSCP_CS7 |
}; |