diff options
author | tfarina <tfarina@chromium.org> | 2015-10-12 17:29:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-13 00:30:52 +0000 |
commit | 73144d18b26e5914ea729a139da125995849f5eb (patch) | |
tree | 1b910e0112659e00e3abd7eac2aa44c7c99521b0 | |
parent | bb9cbc7f87efb8b4c756c79b29a4356023210c71 (diff) | |
download | chromium_src-73144d18b26e5914ea729a139da125995849f5eb.zip chromium_src-73144d18b26e5914ea729a139da125995849f5eb.tar.gz chromium_src-73144d18b26e5914ea729a139da125995849f5eb.tar.bz2 |
net: Move IPAddressAttributes enum out of net_util.h.
This patch moves IPAddressAttributes enum into network_interfaces.h (since it
is only used for the ip attributes from interfaces), to help breaking up
net_util.h further.
BUG=488531
R=eroman@chromium.org
TBR=gene@chromium.org,armansito@chromium.org,zea@chromium.org,mathp@chromium.org,reillyg@chromium.org,pauljensen@chromium.org
Review URL: https://codereview.chromium.org/1399533004
Cr-Commit-Position: refs/heads/master@{#353640}
-rw-r--r-- | chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc | 1 | ||||
-rw-r--r-- | chrome/browser/local_discovery/privet_traffic_detector.cc | 1 | ||||
-rw-r--r-- | components/cronet/android/cronet_url_request_context_adapter.cc | 1 | ||||
-rw-r--r-- | components/suggestions/suggestions_service_unittest.cc | 1 | ||||
-rw-r--r-- | device/test/DEPS | 1 | ||||
-rw-r--r-- | device/test/usb_test_gadget_impl.cc | 1 | ||||
-rw-r--r-- | extensions/browser/api/socket/socket_api.cc | 1 | ||||
-rw-r--r-- | google_apis/gcm/engine/registration_request_unittest.cc | 1 | ||||
-rw-r--r-- | net/base/address_tracker_linux.h | 2 | ||||
-rw-r--r-- | net/base/net_util.h | 18 | ||||
-rw-r--r-- | net/base/network_interfaces.h | 18 | ||||
-rw-r--r-- | net/dns/mdns_client.cc | 1 | ||||
-rw-r--r-- | net/http/http_server_properties.h | 2 | ||||
-rw-r--r-- | net/quic/crypto/proof_source.h | 2 | ||||
-rw-r--r-- | net/quic/crypto/proof_source_chromium_openssl.cc | 1 | ||||
-rw-r--r-- | net/quic/crypto/quic_crypto_server_config.h | 2 | ||||
-rw-r--r-- | net/quic/quic_unacked_packet_map_test.cc | 1 | ||||
-rw-r--r-- | net/tools/quic/quic_server.cc | 1 | ||||
-rw-r--r-- | net/udp/udp_server_socket.h | 2 |
19 files changed, 35 insertions, 23 deletions
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc b/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc index 92f63e3..0dca49f 100644 --- a/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc +++ b/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc @@ -10,6 +10,7 @@ #include "base/values.h" #include "chrome/browser/android/contextualsearch/contextual_search_context.h" #include "components/search_engines/template_url_service.h" +#include "net/base/escape.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/local_discovery/privet_traffic_detector.cc b/chrome/browser/local_discovery/privet_traffic_detector.cc index e02f64c..2b76f01 100644 --- a/chrome/browser/local_discovery/privet_traffic_detector.cc +++ b/chrome/browser/local_discovery/privet_traffic_detector.cc @@ -9,6 +9,7 @@ #include "base/single_thread_task_runner.h" #include "base/sys_byteorder.h" #include "net/base/net_errors.h" +#include "net/base/net_util.h" #include "net/base/network_interfaces.h" #include "net/dns/dns_protocol.h" #include "net/dns/dns_response.h" diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc index 29e9c8b..b2af72c 100644 --- a/components/cronet/android/cronet_url_request_context_adapter.cc +++ b/components/cronet/android/cronet_url_request_context_adapter.cc @@ -26,6 +26,7 @@ #include "net/base/external_estimate_provider.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" +#include "net/base/net_util.h" #include "net/base/network_delegate_impl.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_server_properties_manager.h" diff --git a/components/suggestions/suggestions_service_unittest.cc b/components/suggestions/suggestions_service_unittest.cc index c4fe00e..5d93aad 100644 --- a/components/suggestions/suggestions_service_unittest.cc +++ b/components/suggestions/suggestions_service_unittest.cc @@ -14,6 +14,7 @@ #include "components/suggestions/proto/suggestions.pb.h" #include "components/suggestions/suggestions_store.h" #include "components/suggestions/suggestions_utils.h" +#include "net/base/escape.h" #include "net/http/http_response_headers.h" #include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/device/test/DEPS b/device/test/DEPS index 855cb249..c144476 100644 --- a/device/test/DEPS +++ b/device/test/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+net/base", "+net/proxy", "+net/url_request", "+third_party/mojo/src/mojo/edk/embedder", diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc index df85756..f9ccf2c 100644 --- a/device/test/usb_test_gadget_impl.cc +++ b/device/test/usb_test_gadget_impl.cc @@ -27,6 +27,7 @@ #include "device/usb/usb_device.h" #include "device/usb/usb_device_handle.h" #include "device/usb/usb_service.h" +#include "net/base/escape.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc index 456d33e..5ae29fc 100644 --- a/extensions/browser/api/socket/socket_api.cc +++ b/extensions/browser/api/socket/socket_api.cc @@ -23,6 +23,7 @@ #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" +#include "net/base/net_util.h" #include "net/base/network_interfaces.h" #include "net/log/net_log.h" #include "net/url_request/url_request_context.h" diff --git a/google_apis/gcm/engine/registration_request_unittest.cc b/google_apis/gcm/engine/registration_request_unittest.cc index 683e1d8..495b1e1 100644 --- a/google_apis/gcm/engine/registration_request_unittest.cc +++ b/google_apis/gcm/engine/registration_request_unittest.cc @@ -12,6 +12,7 @@ #include "google_apis/gcm/engine/gcm_request_test_base.h" #include "google_apis/gcm/engine/instance_id_get_token_request_handler.h" #include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h" +#include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" diff --git a/net/base/address_tracker_linux.h b/net/base/address_tracker_linux.h index 1721799..16eaad9 100644 --- a/net/base/address_tracker_linux.h +++ b/net/base/address_tracker_linux.h @@ -21,7 +21,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" -#include "net/base/net_util.h" +#include "net/base/ip_address_number.h" #include "net/base/network_change_notifier.h" namespace net { diff --git a/net/base/net_util.h b/net/base/net_util.h index c430019..8691f4b 100644 --- a/net/base/net_util.h +++ b/net/base/net_util.h @@ -213,24 +213,6 @@ NET_EXPORT_PRIVATE bool IsLocalhostTLD(base::StringPiece host); // for histograms and shouldn't be used to affect behavior. NET_EXPORT_PRIVATE bool HasGoogleHost(const GURL& url); -// A subset of IP address attributes which are actionable by the -// application layer. Currently unimplemented for all hosts; -// IP_ADDRESS_ATTRIBUTE_NONE is always returned. -enum IPAddressAttributes { - IP_ADDRESS_ATTRIBUTE_NONE = 0, - - // A temporary address is dynamic by nature and will not contain MAC - // address. Presence of MAC address in IPv6 addresses can be used to - // track an endpoint and cause privacy concern. Please refer to - // RFC4941. - IP_ADDRESS_ATTRIBUTE_TEMPORARY = 1 << 0, - - // A temporary address could become deprecated once the preferred - // lifetime is reached. It is still valid but shouldn't be used to - // create new connections. - IP_ADDRESS_ATTRIBUTE_DEPRECATED = 1 << 1, -}; - } // namespace net #endif // NET_BASE_NET_UTIL_H_ diff --git a/net/base/network_interfaces.h b/net/base/network_interfaces.h index 73ad09a..6b21f51 100644 --- a/net/base/network_interfaces.h +++ b/net/base/network_interfaces.h @@ -40,6 +40,24 @@ struct Parsed; namespace net { +// A subset of IP address attributes which are actionable by the +// application layer. Currently unimplemented for all hosts; +// IP_ADDRESS_ATTRIBUTE_NONE is always returned. +enum IPAddressAttributes { + IP_ADDRESS_ATTRIBUTE_NONE = 0, + + // A temporary address is dynamic by nature and will not contain MAC + // address. Presence of MAC address in IPv6 addresses can be used to + // track an endpoint and cause privacy concern. Please refer to + // RFC4941. + IP_ADDRESS_ATTRIBUTE_TEMPORARY = 1 << 0, + + // A temporary address could become deprecated once the preferred + // lifetime is reached. It is still valid but shouldn't be used to + // create new connections. + IP_ADDRESS_ATTRIBUTE_DEPRECATED = 1 << 1, +}; + // struct that is used by GetNetworkList() to represent a network // interface. struct NET_EXPORT NetworkInterface { diff --git a/net/dns/mdns_client.cc b/net/dns/mdns_client.cc index f7bb48e..4d52d73 100644 --- a/net/dns/mdns_client.cc +++ b/net/dns/mdns_client.cc @@ -5,6 +5,7 @@ #include "net/dns/mdns_client.h" #include "net/base/net_errors.h" +#include "net/base/net_util.h" #include "net/base/network_interfaces.h" #include "net/dns/dns_protocol.h" #include "net/dns/mdns_client_impl.h" diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h index 95f4855..1df4759 100644 --- a/net/http/http_server_properties.h +++ b/net/http/http_server_properties.h @@ -14,8 +14,8 @@ #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "net/base/host_port_pair.h" +#include "net/base/ip_address_number.h" #include "net/base/net_export.h" -#include "net/base/net_util.h" #include "net/quic/quic_bandwidth.h" #include "net/quic/quic_server_id.h" #include "net/socket/next_proto.h" diff --git a/net/quic/crypto/proof_source.h b/net/quic/crypto/proof_source.h index f6eac21..744a8ed 100644 --- a/net/quic/crypto/proof_source.h +++ b/net/quic/crypto/proof_source.h @@ -8,8 +8,8 @@ #include <string> #include <vector> +#include "net/base/ip_address_number.h" #include "net/base/net_export.h" -#include "net/base/net_util.h" namespace net { diff --git a/net/quic/crypto/proof_source_chromium_openssl.cc b/net/quic/crypto/proof_source_chromium_openssl.cc index e122687..c89f2d9 100644 --- a/net/quic/crypto/proof_source_chromium_openssl.cc +++ b/net/quic/crypto/proof_source_chromium_openssl.cc @@ -8,6 +8,7 @@ #include <openssl/evp.h> #include <openssl/rsa.h> +#include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "crypto/openssl_util.h" #include "net/quic/crypto/crypto_protocol.h" diff --git a/net/quic/crypto/quic_crypto_server_config.h b/net/quic/crypto/quic_crypto_server_config.h index 2ab58a2..4a5c83f 100644 --- a/net/quic/crypto/quic_crypto_server_config.h +++ b/net/quic/crypto/quic_crypto_server_config.h @@ -13,9 +13,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" #include "base/synchronization/lock.h" +#include "net/base/ip_address_number.h" #include "net/base/ip_endpoint.h" #include "net/base/net_export.h" -#include "net/base/net_util.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/crypto/crypto_handshake_message.h" #include "net/quic/crypto/crypto_protocol.h" diff --git a/net/quic/quic_unacked_packet_map_test.cc b/net/quic/quic_unacked_packet_map_test.cc index bad705e..1f61935 100644 --- a/net/quic/quic_unacked_packet_map_test.cc +++ b/net/quic/quic_unacked_packet_map_test.cc @@ -4,6 +4,7 @@ #include "net/quic/quic_unacked_packet_map.h" +#include "base/stl_util.h" #include "net/quic/quic_ack_notifier_manager.h" #include "net/quic/quic_flags.h" #include "net/quic/quic_utils.h" diff --git a/net/tools/quic/quic_server.cc b/net/tools/quic/quic_server.cc index 5d551e6..392963d 100644 --- a/net/tools/quic/quic_server.cc +++ b/net/tools/quic/quic_server.cc @@ -12,6 +12,7 @@ #include <sys/socket.h> #include "net/base/ip_endpoint.h" +#include "net/base/net_util.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/crypto/quic_random.h" #include "net/quic/quic_clock.h" diff --git a/net/udp/udp_server_socket.h b/net/udp/udp_server_socket.h index dabb8f0..b2e338b 100644 --- a/net/udp/udp_server_socket.h +++ b/net/udp/udp_server_socket.h @@ -6,7 +6,7 @@ #define NET_SOCKET_UDP_SERVER_SOCKET_H_ #include "net/base/completion_callback.h" -#include "net/base/net_util.h" +#include "net/base/ip_address_number.h" #include "net/udp/datagram_server_socket.h" #include "net/udp/udp_socket.h" |