diff options
162 files changed, 105 insertions, 289 deletions
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc index 7ad10928..091c237 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc @@ -23,7 +23,6 @@ #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/http/http_util.h" diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc index 4ae10a4..a04e5d9 100644 --- a/android_webview/native/android_protocol_handler.cc +++ b/android_webview/native/android_protocol_handler.cc @@ -19,7 +19,6 @@ #include "net/base/io_buffer.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_interceptor.h" diff --git a/apps/launcher.cc b/apps/launcher.cc index 9b01a4d..309dcd58 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -35,7 +35,6 @@ #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/kiosk_mode_info.h" #include "net/base/filename_util.h" -#include "net/base/net_util.h" #include "url/gurl.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/android/history_report/usage_report_util.cc b/chrome/browser/android/history_report/usage_report_util.cc index c2c696e..f6c9efd 100644 --- a/chrome/browser/android/history_report/usage_report_util.cc +++ b/chrome/browser/android/history_report/usage_report_util.cc @@ -9,7 +9,7 @@ #include <sstream> #include "chrome/browser/android/proto/delta_file.pb.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "url/gurl.h" namespace history_report { diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc index 61e5f32..bf15ceb 100644 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc @@ -9,7 +9,6 @@ #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "chrome/browser/profiles/profile_io_data.h" #include "content/public/common/url_constants.h" -#include "net/base/net_util.h" #include "url/url_util.h" ChromeAutocompleteSchemeClassifier::ChromeAutocompleteSchemeClassifier( diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 3138e4f..e272456 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -201,7 +201,6 @@ #include "chrome/installer/util/module_util_win.h" #include "chrome/installer/util/shell_util.h" #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win.h" -#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/gfx/win/dpi.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.cc b/chrome/browser/devtools/device/adb/adb_client_socket.cc index e65375b..d068856 100644 --- a/chrome/browser/devtools/device/adb/adb_client_socket.cc +++ b/chrome/browser/devtools/device/adb/adb_client_socket.cc @@ -14,7 +14,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/socket/tcp_client_socket.h" namespace { diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc index 182b987..76f983a 100644 --- a/chrome/browser/devtools/device/port_forwarding_controller.cc +++ b/chrome/browser/devtools/device/port_forwarding_controller.cc @@ -27,7 +27,6 @@ #include "net/base/address_list.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/dns/host_resolver.h" #include "net/socket/tcp_client_socket.h" diff --git a/chrome/browser/dom_distiller/tab_utils_android.cc b/chrome/browser/dom_distiller/tab_utils_android.cc index 2691bf9..8133eb0 100644 --- a/chrome/browser/dom_distiller/tab_utils_android.cc +++ b/chrome/browser/dom_distiller/tab_utils_android.cc @@ -17,7 +17,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_constants.h" #include "jni/DomDistillerTabUtils_jni.h" -#include "net/base/net_util.h" #include "url/gurl.h" namespace android { diff --git a/chrome/browser/download/download_extensions.cc b/chrome/browser/download/download_extensions.cc index dea28b0..bc7e8eb 100644 --- a/chrome/browser/download/download_extensions.cc +++ b/chrome/browser/download/download_extensions.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" namespace download_util { diff --git a/chrome/browser/download/drag_download_item_views.cc b/chrome/browser/download/drag_download_item_views.cc index 43c25a5..ed61831 100644 --- a/chrome/browser/download/drag_download_item_views.cc +++ b/chrome/browser/download/drag_download_item_views.cc @@ -10,7 +10,6 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/download_item.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/dragdrop/drag_drop_types.h" diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index e85d3eb..5104bef 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -47,7 +47,6 @@ #include "content/public/test/test_navigation_observer.h" #include "net/base/filename_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/failing_http_transaction_factory.h" #include "net/http/http_cache.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc index 4c18cb8..ce17cbf 100644 --- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc +++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc @@ -30,7 +30,6 @@ #include "media/cast/test/utility/net_utility.h" #include "media/cast/test/utility/standalone_cast_environment.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/rand_callback.h" #include "net/udp/udp_server_socket.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc index 409f8fb..41a3c4d 100644 --- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc +++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc @@ -45,7 +45,6 @@ #include "media/cast/test/utility/udp_proxy.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/rand_callback.h" #include "net/udp/udp_server_socket.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/dial/dial_service_unittest.cc b/chrome/browser/extensions/api/dial/dial_service_unittest.cc index 654a3c7..9eae360 100644 --- a/chrome/browser/extensions/api/dial/dial_service_unittest.cc +++ b/chrome/browser/extensions/api/dial/dial_service_unittest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "chrome/browser/extensions/api/dial/dial_service.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #include "net/base/network_interfaces.h" #include "net/log/test_net_log.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 0266ef8..b005528 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -48,7 +48,6 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/notification_types.h" #include "net/base/data_url.h" -#include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/url_request/url_request_slow_download_job.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.cc b/chrome/browser/extensions/api/messaging/native_message_process_host.cc index 691c270..a26df3e 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.cc @@ -22,7 +22,6 @@ #include "net/base/file_stream.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/api/music_manager_private/device_id_win.cc b/chrome/browser/extensions/api/music_manager_private/device_id_win.cc index 64caf3b..90814d7 100644 --- a/chrome/browser/extensions/api/music_manager_private/device_id_win.cc +++ b/chrome/browser/extensions/api/music_manager_private/device_id_win.cc @@ -25,7 +25,6 @@ #include "base/threading/thread_restrictions.h" #include "base/win/windows_version.h" #include "content/public/browser/browser_thread.h" -#include "net/base/net_util.h" #if defined(ENABLE_RLZ) #include "rlz/lib/machine_id.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index d617211..a3c4a1f1 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -47,7 +47,6 @@ #include "extensions/common/features/feature.h" #include "net/base/auth.h" #include "net/base/elements_upload_data_stream.h" -#include "net/base/net_util.h" #include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_file_element_reader.h" diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index e6437ce..8be381a 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -34,7 +34,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/geoposition.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" namespace { diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 557bb17..a9e3d03 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -61,7 +61,6 @@ #include "content/public/common/user_agent.h" #include "net/base/external_estimate_provider.h" #include "net/base/host_mapping_rules.h" -#include "net/base/net_util.h" #include "net/base/network_quality_estimator.h" #include "net/base/sdch_manager.h" #include "net/cert/cert_verifier.h" diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index 28419eb..b4db4b1 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -32,7 +32,6 @@ #include "content/public/common/media_stream_request.h" #include "extensions/common/constants.h" #include "media/base/media_switches.h" -#include "net/base/net_util.h" #if defined(OS_CHROMEOS) #include "ash/shell.h" diff --git a/chrome/browser/media/webrtc_logging_handler_host.cc b/chrome/browser/media/webrtc_logging_handler_host.cc index 2174c53..53b7f5a 100644 --- a/chrome/browser/media/webrtc_logging_handler_host.cc +++ b/chrome/browser/media/webrtc_logging_handler_host.cc @@ -36,7 +36,6 @@ #include "gpu/config/gpu_info.h" #include "net/base/address_family.h" #include "net/base/ip_address_number.h" -#include "net/base/net_util.h" #include "net/url_request/url_request_context_getter.h" #if defined(OS_LINUX) diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_probe_runner.cc index e9e9a7b..fcd0d26 100644 --- a/chrome/browser/net/dns_probe_runner.cc +++ b/chrome/browser/net/dns_probe_runner.cc @@ -11,7 +11,6 @@ #include "net/base/address_list.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/dns/dns_client.h" #include "net/dns/dns_protocol.h" diff --git a/chrome/browser/net/dns_probe_service.cc b/chrome/browser/net/dns_probe_service.cc index fb6c12d..fcec9981 100644 --- a/chrome/browser/net/dns_probe_service.cc +++ b/chrome/browser/net/dns_probe_service.cc @@ -10,7 +10,6 @@ #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #include "net/dns/dns_client.h" #include "net/dns/dns_config_service.h" #include "net/dns/dns_protocol.h" diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index a120e06..4e19c54 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -41,7 +41,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 6817c64..6eab46f 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -163,7 +163,6 @@ #include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/shared_module_info.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/url_util.h" #include "net/http/http_stream_factory.h" #include "net/ssl/ssl_config.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index ed37776..1a8dbe4 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -31,7 +31,6 @@ #include "google_apis/google_api_keys.h" #include "net/base/escape.h" #include "net/base/load_flags.h" -#include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/search_engines/template_url_scraper_browsertest.cc b/chrome/browser/search_engines/template_url_scraper_browsertest.cc index 223c6e0..9303d73 100644 --- a/chrome/browser/search_engines/template_url_scraper_browsertest.cc +++ b/chrome/browser/search_engines/template_url_scraper_browsertest.cc @@ -21,7 +21,6 @@ #include "components/search_engines/template_url_service.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" -#include "net/base/net_util.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index db84cfc..39ccea2 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -45,7 +45,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/net_util.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index 8f70db15..790a49d 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -34,7 +34,6 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser/ssl/captive_portal_blocking_page.cc index 753057f..156abd2 100644 --- a/chrome/browser/ssl/captive_portal_blocking_page.cc +++ b/chrome/browser/ssl/captive_portal_blocking_page.cc @@ -26,7 +26,6 @@ #include "components/wifi/wifi_service.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" -#include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/base/network_interfaces.h" #include "net/ssl/ssl_info.h" diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc index c4e7b44..e3cd5dd 100644 --- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc +++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc @@ -26,7 +26,7 @@ #include "components/content_settings/core/common/content_settings_types.h" #include "components/variations/variations_associated_data.h" #include "net/base/hash_value.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "net/cert/x509_certificate.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 4aa09fa..0775e98a 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -35,7 +35,6 @@ #include "content/public/common/renderer_preferences.h" #include "content/public/common/ssl_status.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" using base::TimeTicks; using content::InterstitialPage; diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index 6bd960b..e737e90 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -21,7 +21,6 @@ #include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" -#include "net/base/net_util.h" #include "ui/base/cocoa/appkit_utils.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 3280b81..c3d9761 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -64,7 +64,6 @@ #include "extensions/common/extension.h" #include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" -#include "net/base/net_util.h" #include "skia/ext/skia_utils_mac.h" #import "ui/base/cocoa/cocoa_base_utils.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc index 26cb0b5..dcff7bc 100644 --- a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc +++ b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc @@ -19,7 +19,6 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" -#include "net/base/net_util.h" #include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index dd84b4d..abfc10d 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -36,7 +36,6 @@ #include "content/public/common/origin_util.h" #include "net/base/auth.h" #include "net/base/load_flags.h" -#include "net/base/net_util.h" #include "net/http/http_auth_scheme.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 82256eb..632e4b1 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -42,7 +42,6 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/constants.h" -#include "net/base/net_util.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/hit_test.h" diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc index 911707f..4ff7e5a 100644 --- a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc +++ b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc @@ -18,7 +18,6 @@ #include "components/password_manager/core/browser/affiliation_utils.h" #include "components/url_formatter/elide_url.h" #include "grit/components_strings.h" -#include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/geometry/rect.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index b0000c2..3b0d9ec 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -64,7 +64,6 @@ #include "content/public/browser/web_ui_message_handler.h" #include "grit/net_internals_resources.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/disk_cache/disk_cache.h" #include "net/dns/host_cache.h" #include "net/dns/host_resolver.h" diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index 1f6caa3..efba085 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc @@ -34,7 +34,6 @@ #include "content/public/browser/web_ui.h" #include "content/public/common/content_switches.h" #include "content/public/common/origin_util.h" -#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) && defined(USE_ASH) diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc index 4012583..8938c69 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc @@ -14,7 +14,6 @@ #include "chrome/browser/ui/webui/quota_internals/quota_internals_types.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_ui.h" -#include "net/base/net_util.h" using content::BrowserContext; diff --git a/chrome/common/net/x509_certificate_model_openssl.cc b/chrome/common/net/x509_certificate_model_openssl.cc index cf99faa..86476bf 100644 --- a/chrome/common/net/x509_certificate_model_openssl.cc +++ b/chrome/common/net/x509_certificate_model_openssl.cc @@ -26,7 +26,6 @@ #include "crypto/openssl_util.h" #include "crypto/scoped_openssl_types.h" #include "net/base/address_family.h" -#include "net/base/net_util.h" #include "net/cert/x509_util_openssl.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/chrome_render_frame_observer.cc index 9085354..af94139 100644 --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc @@ -25,7 +25,7 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_view.h" #include "extensions/common/constants.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "skia/ext/image_operations.h" #include "third_party/WebKit/public/platform/WebImage.h" #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h" diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc index e9fe840..3e0edd1 100644 --- a/chrome/test/chromedriver/capabilities.cc +++ b/chrome/test/chromedriver/capabilities.cc @@ -22,7 +22,6 @@ #include "chrome/test/chromedriver/chrome/mobile_device.h" #include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/logging.h" -#include "net/base/net_util.h" namespace { diff --git a/chrome/test/chromedriver/net/adb_client_socket.cc b/chrome/test/chromedriver/net/adb_client_socket.cc index caa31d3..f772f5f 100644 --- a/chrome/test/chromedriver/net/adb_client_socket.cc +++ b/chrome/test/chromedriver/net/adb_client_socket.cc @@ -15,7 +15,6 @@ #include "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/socket/tcp_client_socket.h" namespace { diff --git a/chrome/test/chromedriver/net/port_server.cc b/chrome/test/chromedriver/net/port_server.cc index 391415f..d496a0b 100644 --- a/chrome/test/chromedriver/net/port_server.cc +++ b/chrome/test/chromedriver/net/port_server.cc @@ -18,7 +18,6 @@ #include "build/build_config.h" #include "chrome/test/chromedriver/chrome/status.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/sys_addrinfo.h" #include "net/log/net_log.h" #include "net/socket/tcp_server_socket.h" diff --git a/chrome/test/chromedriver/net/websocket.cc b/chrome/test/chromedriver/net/websocket.cc index 096191e..38272a9 100644 --- a/chrome/test/chromedriver/net/websocket.cc +++ b/chrome/test/chromedriver/net/websocket.cc @@ -22,7 +22,6 @@ #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/sys_addrinfo.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc index 0b5fd48..2b3e882 100644 --- a/chrome/test/nacl/nacl_browsertest_util.cc +++ b/chrome/test/nacl/nacl_browsertest_util.cc @@ -19,7 +19,6 @@ #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_contents.h" #include "content/public/common/webplugininfo.h" -#include "net/base/net_util.h" typedef content::TestMessageHandler::MessageResponse MessageResponse; diff --git a/chromeos/network/host_resolver_impl_chromeos.cc b/chromeos/network/host_resolver_impl_chromeos.cc index 61a9da9..6f06aa90 100644 --- a/chromeos/network/host_resolver_impl_chromeos.cc +++ b/chromeos/network/host_resolver_impl_chromeos.cc @@ -17,7 +17,6 @@ #include "chromeos/network/network_state_handler_observer.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "third_party/cros_system_api/dbus/service_constants.h" namespace chromeos { diff --git a/components/app_modal/javascript_dialog_manager.cc b/components/app_modal/javascript_dialog_manager.cc index 3940e5a..ec47620 100644 --- a/components/app_modal/javascript_dialog_manager.cc +++ b/components/app_modal/javascript_dialog_manager.cc @@ -21,7 +21,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/javascript_message_type.h" #include "grit/components_strings.h" -#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/font_list.h" diff --git a/components/cronet/android/test/quic_test_server.cc b/components/cronet/android/test/quic_test_server.cc index 13c4b65..8f21eae 100644 --- a/components/cronet/android/test/quic_test_server.cc +++ b/components/cronet/android/test/quic_test_server.cc @@ -14,7 +14,6 @@ #include "components/cronet/android/test/cronet_test_util.h" #include "jni/QuicTestServer_jni.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #include "net/base/test_data_directory.h" #include "net/quic/crypto/proof_source_chromium.h" #include "net/tools/quic/quic_in_memory_cache.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc index 548f773..fee0df86 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc @@ -9,7 +9,6 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h" -#include "net/base/net_util.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc index 4ab77a8..15356ab 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc @@ -15,7 +15,7 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_creator.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "net/base/host_port_pair.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/proxy/proxy_server.h" diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc index 4a89e83..593cade 100644 --- a/components/domain_reliability/monitor.cc +++ b/components/domain_reliability/monitor.cc @@ -18,7 +18,6 @@ #include "net/base/ip_endpoint.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" diff --git a/components/history/core/browser/typed_url_syncable_service.cc b/components/history/core/browser/typed_url_syncable_service.cc index d5a9942..ec128e1 100644 --- a/components/history/core/browser/typed_url_syncable_service.cc +++ b/components/history/core/browser/typed_url_syncable_service.cc @@ -12,7 +12,7 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "components/history/core/browser/history_backend.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "sync/protocol/sync.pb.h" #include "sync/protocol/typed_url_specifics.pb.h" diff --git a/components/omnibox/browser/autocomplete_provider.cc b/components/omnibox/browser/autocomplete_provider.cc index a592ea3..b5963c7 100644 --- a/components/omnibox/browser/autocomplete_provider.cc +++ b/components/omnibox/browser/autocomplete_provider.cc @@ -9,7 +9,6 @@ #include "components/omnibox/browser/autocomplete_input.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/url_formatter/url_fixer.h" -#include "net/base/net_util.h" #include "url/gurl.h" // static diff --git a/components/omnibox/browser/in_memory_url_index_types.cc b/components/omnibox/browser/in_memory_url_index_types.cc index 6215e41..710513c 100644 --- a/components/omnibox/browser/in_memory_url_index_types.cc +++ b/components/omnibox/browser/in_memory_url_index_types.cc @@ -14,7 +14,6 @@ #include "base/i18n/case_conversion.h" #include "base/strings/string_util.h" #include "net/base/escape.h" -#include "net/base/net_util.h" namespace { // The maximum number of characters to consider from an URL and page title diff --git a/components/omnibox/browser/keyword_provider.cc b/components/omnibox/browser/keyword_provider.cc index a0b5cc8..e4e21b3 100644 --- a/components/omnibox/browser/keyword_provider.cc +++ b/components/omnibox/browser/keyword_provider.cc @@ -22,7 +22,6 @@ #include "components/search_engines/template_url_service.h" #include "grit/components_strings.h" #include "net/base/escape.h" -#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/components/rappor/rappor_utils.cc b/components/rappor/rappor_utils.cc index 9b253c2..89e4576 100644 --- a/components/rappor/rappor_utils.cc +++ b/components/rappor/rappor_utils.cc @@ -5,8 +5,8 @@ #include "components/rappor/rappor_utils.h" #include "components/rappor/rappor_service.h" -#include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" +#include "net/base/url_util.h" #include "url/gurl.h" namespace rappor { diff --git a/components/ssl_errors/error_classification.cc b/components/ssl_errors/error_classification.cc index dccacbc9..7ab390b 100644 --- a/components/ssl_errors/error_classification.cc +++ b/components/ssl_errors/error_classification.cc @@ -18,7 +18,6 @@ #include "build/build_config.h" #include "components/ssl_errors/error_info.h" #include "components/url_formatter/url_formatter.h" -#include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/url_util.h" diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index b0c1c63d..9fc8c41 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc @@ -9,7 +9,6 @@ #include "content/public/test/content_browser_test.h" #include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "net/base/net_util.h" namespace content { diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc index 35ef960..532d50d 100644 --- a/content/browser/download/download_item_impl.cc +++ b/content/browser/download/download_item_impl.cc @@ -50,7 +50,6 @@ #include "content/public/browser/download_url_parameters.h" #include "content/public/common/content_features.h" #include "content/public/common/referrer.h" -#include "net/base/net_util.h" namespace content { diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc index 933f637..56bf593 100644 --- a/content/browser/download/download_manager_impl_unittest.cc +++ b/content/browser/download/download_manager_impl_unittest.cc @@ -37,7 +37,6 @@ #include "content/public/test/mock_download_item.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread.h" -#include "net/base/net_util.h" #include "net/log/net_log.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock_mutant.h" diff --git a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc index 15f376c..f3576cb 100644 --- a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc @@ -22,7 +22,6 @@ #include "content/public/test/test_file_system_backend.h" #include "content/public/test/test_file_system_context.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/request_priority.h" #include "net/http/http_request_headers.h" #include "net/url_request/url_request.h" diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc index 4b2715c..58ab33b6 100644 --- a/content/browser/fileapi/file_system_url_request_job_unittest.cc +++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc @@ -27,7 +27,6 @@ #include "net/base/load_flags.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/request_priority.h" #include "net/http/http_byte_range.h" #include "net/http/http_request_headers.h" diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc index e1c24c7..c08834b 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -79,7 +79,6 @@ #include "content/public/common/content_switches.h" #include "media/base/mime_util.h" #include "net/base/escape.h" -#include "net/base/net_util.h" #include "skia/ext/platform_canvas.h" #include "url/url_constants.h" diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc index 6121d1f..7a7f4bf2 100644 --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc @@ -46,7 +46,6 @@ #include "content/test/test_render_frame_host.h" #include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" -#include "net/base/net_util.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc index 4a37ef5..644ba90 100644 --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc @@ -48,7 +48,6 @@ #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/test/content_browser_test_utils_internal.h" -#include "net/base/net_util.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/request_handler_util.h" diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc index f439449..8f02d3f 100644 --- a/content/browser/loader/async_resource_handler.cc +++ b/content/browser/loader/async_resource_handler.cc @@ -31,7 +31,6 @@ #include "content/public/common/resource_response.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" -#include "net/base/net_util.h" #include "net/log/net_log.h" #include "net/url_request/redirect_info.h" diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc index f1c2210..10398dc 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc @@ -16,7 +16,6 @@ #include "jingle/glue/proxy_resolving_client_socket.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc index dc49bfd..3d55c29 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc @@ -11,7 +11,6 @@ #include "content/common/p2p_messages.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/socket/stream_socket.h" namespace { diff --git a/content/browser/renderer_host/p2p/socket_host_udp.cc b/content/browser/renderer_host/p2p/socket_host_udp.cc index 66ee61f..f7c56f9 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp.cc +++ b/content/browser/renderer_host/p2p/socket_host_udp.cc @@ -18,7 +18,6 @@ #include "ipc/ipc_sender.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "third_party/webrtc/media/base/rtputils.h" namespace { diff --git a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc index ec685e5..5f9707a 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc @@ -17,7 +17,6 @@ #include "content/public/common/socket_permission_request.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_net_address_private.h" #include "ppapi/host/dispatch_host_message.h" diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc index 343e6da..40a3220 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host.cc @@ -30,7 +30,6 @@ #include "content/public/common/content_client.h" #include "content/public/common/origin_util.h" #include "ipc/ipc_message_macros.h" -#include "net/base/net_util.h" #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerError.h" #include "url/gurl.h" diff --git a/content/child/multipart_response_delegate.cc b/content/child/multipart_response_delegate.cc index 02f725d..03ffdd3 100644 --- a/content/child/multipart_response_delegate.cc +++ b/content/child/multipart_response_delegate.cc @@ -9,7 +9,6 @@ #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc index 137d2ce..26175ce 100644 --- a/content/child/resource_dispatcher.cc +++ b/content/child/resource_dispatcher.cc @@ -38,7 +38,6 @@ #include "content/public/common/resource_response.h" #include "content/public/common/resource_type.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/request_priority.h" #include "net/http/http_response_headers.h" diff --git a/content/common/origin_util.cc b/content/common/origin_util.cc index 9c6b631..4dfdc6c 100644 --- a/content/common/origin_util.cc +++ b/content/common/origin_util.cc @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/stl_util.h" #include "content/public/common/content_client.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "url/gurl.h" namespace content { diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc index 1c9acb9..025fc0c 100644 --- a/content/renderer/p2p/ipc_network_manager.cc +++ b/content/renderer/p2p/ipc_network_manager.cc @@ -15,7 +15,6 @@ #include "content/public/common/content_switches.h" #include "jingle/glue/utils.h" #include "net/base/ip_address_number.h" -#include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/base/network_interfaces.h" #include "third_party/webrtc/base/socketaddress.h" diff --git a/content/renderer/p2p/ipc_network_manager_unittest.cc b/content/renderer/p2p/ipc_network_manager_unittest.cc index 7baaaf2..31fcd47 100644 --- a/content/renderer/p2p/ipc_network_manager_unittest.cc +++ b/content/renderer/p2p/ipc_network_manager_unittest.cc @@ -6,7 +6,6 @@ #include "content/renderer/p2p/ipc_network_manager.h" #include "content/renderer/p2p/network_list_manager.h" #include "net/base/ip_address_number.h" -#include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/base/network_interfaces.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc index e6352b0..969b680 100644 --- a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc +++ b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc @@ -11,7 +11,6 @@ #include "content/shell/browser/layout_test/blink_test_controller.h" #include "content/shell/browser/shell_javascript_dialog.h" #include "content/shell/common/shell_switches.h" -#include "net/base/net_util.h" namespace content { diff --git a/extensions/browser/api/cast_channel/cast_channel_api.cc b/extensions/browser/api/cast_channel/cast_channel_api.cc index c0f8821..b5593f7 100644 --- a/extensions/browser/api/cast_channel/cast_channel_api.cc +++ b/extensions/browser/api/cast_channel/cast_channel_api.cc @@ -28,7 +28,6 @@ #include "extensions/common/api/cast_channel/logging.pb.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" // Default timeout interval for connection setup. // Used if not otherwise specified at ConnectInfo::timeout. diff --git a/extensions/browser/api/cast_channel/cast_socket.cc b/extensions/browser/api/cast_channel/cast_socket.cc index 6a330e3..12df2bf 100644 --- a/extensions/browser/api/cast_channel/cast_socket.cc +++ b/extensions/browser/api/cast_channel/cast_socket.cc @@ -28,7 +28,6 @@ #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/cert/cert_verifier.h" #include "net/cert/cert_verify_result.h" #include "net/cert/x509_certificate.h" diff --git a/extensions/browser/api/cast_channel/cast_socket_unittest.cc b/extensions/browser/api/cast_channel/cast_socket_unittest.cc index f79ce16..dbc46dc 100644 --- a/extensions/browser/api/cast_channel/cast_socket_unittest.cc +++ b/extensions/browser/api/cast_channel/cast_socket_unittest.cc @@ -26,7 +26,6 @@ #include "extensions/common/api/cast_channel/cast_channel.pb.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/log/test_net_log.h" #include "net/socket/socket_test_util.h" #include "net/socket/ssl_client_socket.h" diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc index 7653f56..88b2a83 100644 --- a/extensions/browser/api/socket/socket_api.cc +++ b/extensions/browser/api/socket/socket_api.cc @@ -25,8 +25,8 @@ #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/base/url_util.h" #include "net/log/net_log.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/extensions/browser/extension_throttle_manager.cc b/extensions/browser/extension_throttle_manager.cc index 6a9f253..16d9501 100644 --- a/extensions/browser/extension_throttle_manager.cc +++ b/extensions/browser/extension_throttle_manager.cc @@ -12,7 +12,7 @@ #include "base/strings/string_util.h" #include "extensions/browser/extension_request_limiting_throttle.h" #include "extensions/common/constants.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "net/log/net_log.h" #include "net/url_request/url_request.h" diff --git a/ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.mm b/ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.mm index 868a9eb..f65ed78 100644 --- a/ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.mm +++ b/ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.mm @@ -7,7 +7,6 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "ios/chrome/browser/chrome_url_util.h" -#include "net/base/net_util.h" #include "url/url_util.h" AutocompleteSchemeClassifierImpl::AutocompleteSchemeClassifierImpl() {} diff --git a/ios/chrome/browser/ios_chrome_io_thread.mm b/ios/chrome/browser/ios_chrome_io_thread.mm index d29695a..61dfa99 100644 --- a/ios/chrome/browser/ios_chrome_io_thread.mm +++ b/ios/chrome/browser/ios_chrome_io_thread.mm @@ -43,7 +43,6 @@ #include "ios/web/public/web_client.h" #include "ios/web/public/web_thread.h" #include "net/base/external_estimate_provider.h" -#include "net/base/net_util.h" #include "net/base/network_quality_estimator.h" #include "net/base/sdch_manager.h" #include "net/cert/cert_verifier.h" diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_handler.mm index 155829d..477eb13 100644 --- a/ios/net/crn_http_protocol_handler.mm +++ b/ios/net/crn_http_protocol_handler.mm @@ -32,7 +32,6 @@ #include "net/base/load_flags.h" #import "net/base/mac/url_conversions.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/upload_bytes_element_reader.h" #include "net/http/http_request_headers.h" #include "net/url_request/redirect_info.h" diff --git a/ios/web/public/origin_util.cc b/ios/web/public/origin_util.cc index 43e002d..28b39a9 100644 --- a/ios/web/public/origin_util.cc +++ b/ios/web/public/origin_util.cc @@ -4,7 +4,7 @@ #include "ios/web/public/origin_util.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "url/gurl.h" namespace web { diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc index 52b35b52..38bca58 100644 --- a/jingle/glue/chrome_async_socket.cc +++ b/jingle/glue/chrome_async_socket.cc @@ -18,7 +18,6 @@ #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/tcp_client_socket.h" diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc index fd8193d..0a9fd31 100644 --- a/jingle/glue/chrome_async_socket_unittest.cc +++ b/jingle/glue/chrome_async_socket_unittest.cc @@ -17,7 +17,6 @@ #include "jingle/glue/resolving_client_socket_factory.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/cert/mock_cert_verifier.h" #include "net/http/transport_security_state.h" #include "net/socket/socket_test_util.h" diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc index 618ac5c..d74c6bc 100644 --- a/jingle/glue/utils.cc +++ b/jingle/glue/utils.cc @@ -12,7 +12,6 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #include "third_party/webrtc/base/byteorder.h" #include "third_party/webrtc/base/socketaddress.h" #include "third_party/webrtc/p2p/base/candidate.h" diff --git a/media/cast/net/udp_transport_unittest.cc b/media/cast/net/udp_transport_unittest.cc index 63f1043..1e7729b 100644 --- a/media/cast/net/udp_transport_unittest.cc +++ b/media/cast/net/udp_transport_unittest.cc @@ -15,7 +15,6 @@ #include "base/run_loop.h" #include "media/cast/net/cast_transport_config.h" #include "media/cast/test/utility/net_utility.h" -#include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/cast/test/receiver.cc b/media/cast/test/receiver.cc index 67d8462..c9e52da 100644 --- a/media/cast/test/receiver.cc +++ b/media/cast/test/receiver.cc @@ -44,7 +44,6 @@ #include "media/cast/test/utility/in_process_receiver.h" #include "media/cast/test/utility/input_builder.h" #include "media/cast/test/utility/standalone_cast_environment.h" -#include "net/base/net_util.h" #if defined(USE_X11) #include "media/cast/test/linux_output_window.h" diff --git a/net/base/address_list.cc b/net/base/address_list.cc index 5b4fe34..f065b35 100644 --- a/net/base/address_list.cc +++ b/net/base/address_list.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/values.h" -#include "net/base/net_util.h" #include "net/base/sys_addrinfo.h" namespace net { diff --git a/net/base/ip_address_number_unittest.cc b/net/base/ip_address_number_unittest.cc index 93e6d90..67d9f31 100644 --- a/net/base/ip_address_number_unittest.cc +++ b/net/base/ip_address_number_unittest.cc @@ -7,7 +7,6 @@ #include "base/format_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/net_util.cc b/net/base/net_util.cc deleted file mode 100644 index 92db80c..0000000 --- a/net/base/net_util.cc +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "net/base/net_util.h" - -#include "build/build_config.h" - -#if defined(OS_POSIX) -#include <netinet/in.h> -#elif defined(OS_WIN) -#include <ws2tcpip.h> -#endif - -#include "base/logging.h" -#include "net/base/ip_address_number.h" -#include "net/base/url_util.h" - -namespace net { - -bool IsLocalhost(base::StringPiece host) { - if (IsLocalHostname(host, nullptr)) - return true; - - IPAddressNumber ip_number; - if (ParseIPLiteralToNumber(host, &ip_number)) { - size_t size = ip_number.size(); - switch (size) { - case kIPv4AddressSize: { - IPAddressNumber localhost_prefix; - localhost_prefix.push_back(127); - for (int i = 0; i < 3; ++i) { - localhost_prefix.push_back(0); - } - return IPNumberMatchesPrefix(ip_number, localhost_prefix, 8); - } - - case kIPv6AddressSize: { - struct in6_addr sin6_addr; - memcpy(&sin6_addr, &ip_number[0], kIPv6AddressSize); - return !!IN6_IS_ADDR_LOOPBACK(&sin6_addr); - } - - default: - NOTREACHED(); - } - } - - return false; -} - -} // namespace net diff --git a/net/base/net_util.h b/net/base/net_util.h deleted file mode 100644 index 329a008..0000000 --- a/net/base/net_util.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef NET_BASE_NET_UTIL_H_ -#define NET_BASE_NET_UTIL_H_ - -#include "base/strings/string_piece.h" -#include "net/base/net_export.h" - -namespace net { - -// Returns true if |host| is one of the local hostnames -// (e.g. "localhost") or IP addresses (IPv4 127.0.0.0/8 or IPv6 ::1). -// -// Note that this function does not check for IP addresses other than -// the above, although other IP addresses may point to the local -// machine. -NET_EXPORT bool IsLocalhost(base::StringPiece host); - -} // namespace net - -#endif // NET_BASE_NET_UTIL_H_ diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc deleted file mode 100644 index 4e2d476..0000000 --- a/net/base/net_util_unittest.cc +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "net/base/net_util.h" - -#include "testing/gtest/include/gtest/gtest.h" - -namespace net { - -TEST(NetUtilTest, IsLocalhost) { - EXPECT_TRUE(IsLocalhost("localhost")); - EXPECT_TRUE(IsLocalhost("localHosT")); - EXPECT_TRUE(IsLocalhost("localhost.")); - EXPECT_TRUE(IsLocalhost("localHost.")); - EXPECT_TRUE(IsLocalhost("localhost.localdomain")); - EXPECT_TRUE(IsLocalhost("localhost.localDOMain")); - EXPECT_TRUE(IsLocalhost("localhost.localdomain.")); - EXPECT_TRUE(IsLocalhost("localhost6")); - EXPECT_TRUE(IsLocalhost("localhost6.")); - EXPECT_TRUE(IsLocalhost("localhost6.localdomain6")); - EXPECT_TRUE(IsLocalhost("localhost6.localdomain6.")); - EXPECT_TRUE(IsLocalhost("127.0.0.1")); - EXPECT_TRUE(IsLocalhost("127.0.1.0")); - EXPECT_TRUE(IsLocalhost("127.1.0.0")); - EXPECT_TRUE(IsLocalhost("127.0.0.255")); - EXPECT_TRUE(IsLocalhost("127.0.255.0")); - EXPECT_TRUE(IsLocalhost("127.255.0.0")); - EXPECT_TRUE(IsLocalhost("::1")); - EXPECT_TRUE(IsLocalhost("0:0:0:0:0:0:0:1")); - EXPECT_TRUE(IsLocalhost("foo.localhost")); - EXPECT_TRUE(IsLocalhost("foo.localhost.")); - EXPECT_TRUE(IsLocalhost("foo.localhoST")); - EXPECT_TRUE(IsLocalhost("foo.localhoST.")); - - EXPECT_FALSE(IsLocalhost("localhostx")); - EXPECT_FALSE(IsLocalhost("localhost.x")); - EXPECT_FALSE(IsLocalhost("foo.localdomain")); - EXPECT_FALSE(IsLocalhost("foo.localdomain.x")); - EXPECT_FALSE(IsLocalhost("localhost6x")); - EXPECT_FALSE(IsLocalhost("localhost.localdomain6")); - EXPECT_FALSE(IsLocalhost("localhost6.localdomain")); - EXPECT_FALSE(IsLocalhost("127.0.0.1.1")); - EXPECT_FALSE(IsLocalhost(".127.0.0.255")); - EXPECT_FALSE(IsLocalhost("::2")); - EXPECT_FALSE(IsLocalhost("::1:1")); - EXPECT_FALSE(IsLocalhost("0:0:0:0:1:0:0:1")); - EXPECT_FALSE(IsLocalhost("::1:1")); - EXPECT_FALSE(IsLocalhost("0:0:0:0:0:0:0:0:1")); - EXPECT_FALSE(IsLocalhost("foo.localhost.com")); - EXPECT_FALSE(IsLocalhost("foo.localhoste")); - EXPECT_FALSE(IsLocalhost("foo.localhos")); -} - -} // namespace net diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc index 52e5ce3..17c91f5 100644 --- a/net/base/network_change_notifier.cc +++ b/net/base/network_change_notifier.cc @@ -12,9 +12,9 @@ #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "build/build_config.h" -#include "net/base/net_util.h" #include "net/base/network_change_notifier_factory.h" #include "net/base/network_interfaces.h" +#include "net/base/url_util.h" #include "net/dns/dns_config_service.h" #include "net/url_request/url_request.h" #include "url/gurl.h" diff --git a/net/base/network_interfaces_linux.cc b/net/base/network_interfaces_linux.cc index 8aea321..4601487 100644 --- a/net/base/network_interfaces_linux.cc +++ b/net/base/network_interfaces_linux.cc @@ -26,7 +26,6 @@ #include "net/base/escape.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/network_interfaces_posix.h" #include "url/gurl.h" diff --git a/net/base/network_interfaces_mac.cc b/net/base/network_interfaces_mac.cc index 2357cd6..66385ac 100644 --- a/net/base/network_interfaces_mac.cc +++ b/net/base/network_interfaces_mac.cc @@ -20,7 +20,6 @@ #include "net/base/escape.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/network_interfaces_posix.h" #include "url/gurl.h" diff --git a/net/base/network_interfaces_unittest.cc b/net/base/network_interfaces_unittest.cc index 6f27e1f..c4b72df 100644 --- a/net/base/network_interfaces_unittest.cc +++ b/net/base/network_interfaces_unittest.cc @@ -19,7 +19,6 @@ #include "base/sys_byteorder.h" #include "base/time/time.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #if !defined(OS_NACL) && !defined(OS_WIN) #include <net/if.h> diff --git a/net/base/network_interfaces_win.cc b/net/base/network_interfaces_win.cc index ac79391..fd11994 100644 --- a/net/base/network_interfaces_win.cc +++ b/net/base/network_interfaces_win.cc @@ -21,7 +21,6 @@ #include "net/base/escape.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "url/gurl.h" namespace net { diff --git a/net/base/network_quality_estimator.cc b/net/base/network_quality_estimator.cc index 37cbcc0..e0a10cf 100644 --- a/net/base/network_quality_estimator.cc +++ b/net/base/network_quality_estimator.cc @@ -18,8 +18,8 @@ #include "build/build_config.h" #include "net/base/load_flags.h" #include "net/base/load_timing_info.h" -#include "net/base/net_util.h" #include "net/base/network_interfaces.h" +#include "net/base/url_util.h" #include "net/url_request/url_request.h" #include "url/gurl.h" diff --git a/net/base/url_util.cc b/net/base/url_util.cc index 797d1c8..86a6108 100644 --- a/net/base/url_util.cc +++ b/net/base/url_util.cc @@ -4,6 +4,14 @@ #include "net/base/url_util.h" +#include "build/build_config.h" + +#if defined(OS_POSIX) +#include <netinet/in.h> +#elif defined(OS_WIN) +#include <ws2tcpip.h> +#endif + #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" @@ -343,6 +351,37 @@ bool IsHostnameNonUnique(const std::string& hostname) { registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); } +bool IsLocalhost(base::StringPiece host) { + if (IsLocalHostname(host, nullptr)) + return true; + + IPAddressNumber ip_number; + if (ParseIPLiteralToNumber(host, &ip_number)) { + size_t size = ip_number.size(); + switch (size) { + case kIPv4AddressSize: { + IPAddressNumber localhost_prefix; + localhost_prefix.push_back(127); + for (int i = 0; i < 3; ++i) { + localhost_prefix.push_back(0); + } + return IPNumberMatchesPrefix(ip_number, localhost_prefix, 8); + } + + case kIPv6AddressSize: { + struct in6_addr sin6_addr; + memcpy(&sin6_addr, &ip_number[0], kIPv6AddressSize); + return !!IN6_IS_ADDR_LOOPBACK(&sin6_addr); + } + + default: + NOTREACHED(); + } + } + + return false; +} + GURL SimplifyUrlForRequest(const GURL& url) { DCHECK(url.is_valid()); GURL::Replacements replacements; diff --git a/net/base/url_util.h b/net/base/url_util.h index 517aaa3..75f7b62 100644 --- a/net/base/url_util.h +++ b/net/base/url_util.h @@ -142,6 +142,14 @@ NET_EXPORT bool IsCanonicalizedHostCompliant(const std::string& host); // that falls in an IANA-reserved range. NET_EXPORT bool IsHostnameNonUnique(const std::string& hostname); +// Returns true if |host| is one of the local hostnames +// (e.g. "localhost") or IP addresses (IPv4 127.0.0.0/8 or IPv6 ::1). +// +// Note that this function does not check for IP addresses other than +// the above, although other IP addresses may point to the local +// machine. +NET_EXPORT bool IsLocalhost(base::StringPiece host); + // Strip the portions of |url| that aren't core to the network request. // - user name / password // - reference section diff --git a/net/base/url_util_unittest.cc b/net/base/url_util_unittest.cc index b670165..3a7a1b4 100644 --- a/net/base/url_util_unittest.cc +++ b/net/base/url_util_unittest.cc @@ -387,6 +387,50 @@ TEST_P(UrlUtilNonUniqueNameTest, IsHostnameNonUnique) { INSTANTIATE_TEST_CASE_P(, UrlUtilNonUniqueNameTest, testing::ValuesIn(kNonUniqueNameTestData)); +TEST(UrlUtilTest, IsLocalhost) { + EXPECT_TRUE(IsLocalhost("localhost")); + EXPECT_TRUE(IsLocalhost("localHosT")); + EXPECT_TRUE(IsLocalhost("localhost.")); + EXPECT_TRUE(IsLocalhost("localHost.")); + EXPECT_TRUE(IsLocalhost("localhost.localdomain")); + EXPECT_TRUE(IsLocalhost("localhost.localDOMain")); + EXPECT_TRUE(IsLocalhost("localhost.localdomain.")); + EXPECT_TRUE(IsLocalhost("localhost6")); + EXPECT_TRUE(IsLocalhost("localhost6.")); + EXPECT_TRUE(IsLocalhost("localhost6.localdomain6")); + EXPECT_TRUE(IsLocalhost("localhost6.localdomain6.")); + EXPECT_TRUE(IsLocalhost("127.0.0.1")); + EXPECT_TRUE(IsLocalhost("127.0.1.0")); + EXPECT_TRUE(IsLocalhost("127.1.0.0")); + EXPECT_TRUE(IsLocalhost("127.0.0.255")); + EXPECT_TRUE(IsLocalhost("127.0.255.0")); + EXPECT_TRUE(IsLocalhost("127.255.0.0")); + EXPECT_TRUE(IsLocalhost("::1")); + EXPECT_TRUE(IsLocalhost("0:0:0:0:0:0:0:1")); + EXPECT_TRUE(IsLocalhost("foo.localhost")); + EXPECT_TRUE(IsLocalhost("foo.localhost.")); + EXPECT_TRUE(IsLocalhost("foo.localhoST")); + EXPECT_TRUE(IsLocalhost("foo.localhoST.")); + + EXPECT_FALSE(IsLocalhost("localhostx")); + EXPECT_FALSE(IsLocalhost("localhost.x")); + EXPECT_FALSE(IsLocalhost("foo.localdomain")); + EXPECT_FALSE(IsLocalhost("foo.localdomain.x")); + EXPECT_FALSE(IsLocalhost("localhost6x")); + EXPECT_FALSE(IsLocalhost("localhost.localdomain6")); + EXPECT_FALSE(IsLocalhost("localhost6.localdomain")); + EXPECT_FALSE(IsLocalhost("127.0.0.1.1")); + EXPECT_FALSE(IsLocalhost(".127.0.0.255")); + EXPECT_FALSE(IsLocalhost("::2")); + EXPECT_FALSE(IsLocalhost("::1:1")); + EXPECT_FALSE(IsLocalhost("0:0:0:0:1:0:0:1")); + EXPECT_FALSE(IsLocalhost("::1:1")); + EXPECT_FALSE(IsLocalhost("0:0:0:0:0:0:0:0:1")); + EXPECT_FALSE(IsLocalhost("foo.localhost.com")); + EXPECT_FALSE(IsLocalhost("foo.localhoste")); + EXPECT_FALSE(IsLocalhost("foo.localhos")); +} + TEST(UrlUtilTest, SimplifyUrlForRequest) { struct { const char* const input_url; diff --git a/net/dns/address_sorter_posix_unittest.cc b/net/dns/address_sorter_posix_unittest.cc index 1212978..d464bab 100644 --- a/net/dns/address_sorter_posix_unittest.cc +++ b/net/dns/address_sorter_posix_unittest.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/macros.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/socket/client_socket_factory.h" #include "net/socket/ssl_client_socket.h" diff --git a/net/dns/address_sorter_unittest.cc b/net/dns/address_sorter_unittest.cc index 0c2be88..5038b4f 100644 --- a/net/dns/address_sorter_unittest.cc +++ b/net/dns/address_sorter_unittest.cc @@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/logging.h" #include "net/base/address_list.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index 92d7dff..ab84b22 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -19,7 +19,6 @@ #include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #include "net/dns/dns_hosts.h" #include "net/dns/dns_protocol.h" #include "net/dns/notify_watcher_mac.h" diff --git a/net/dns/dns_config_service_unittest.cc b/net/dns/dns_config_service_unittest.cc index 40796ad..aa4b3c8 100644 --- a/net/dns/dns_config_service_unittest.cc +++ b/net/dns/dns_config_service_unittest.cc @@ -13,7 +13,6 @@ #include "base/strings/string_split.h" #include "base/test/test_timeouts.h" #include "base/thread_task_runner_handle.h" -#include "net/base/net_util.h" #include "net/dns/dns_protocol.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index a08feb5..1bdbb59 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -26,7 +26,6 @@ #include "base/win/registry.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" -#include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/dns/dns_hosts.h" #include "net/dns/dns_protocol.h" diff --git a/net/dns/dns_response_unittest.cc b/net/dns/dns_response_unittest.cc index e701c9a..46f50ed 100644 --- a/net/dns/dns_response_unittest.cc +++ b/net/dns/dns_response_unittest.cc @@ -7,7 +7,6 @@ #include "base/time/time.h" #include "net/base/address_list.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "net/dns/dns_protocol.h" #include "net/dns/dns_query.h" #include "net/dns/dns_test_util.h" diff --git a/net/dns/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc index c4e863c..3d30dbe 100644 --- a/net/dns/host_resolver_impl_unittest.cc +++ b/net/dns/host_resolver_impl_unittest.cc @@ -27,7 +27,6 @@ #include "base/time/time.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/dns/dns_client.h" #include "net/dns/dns_test_util.h" #include "net/dns/mock_host_resolver.h" diff --git a/net/dns/mapped_host_resolver.cc b/net/dns/mapped_host_resolver.cc index 9746114..5474cc3 100644 --- a/net/dns/mapped_host_resolver.cc +++ b/net/dns/mapped_host_resolver.cc @@ -10,7 +10,6 @@ #include "base/values.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" namespace net { diff --git a/net/dns/mapped_host_resolver_unittest.cc b/net/dns/mapped_host_resolver_unittest.cc index 002a988..dd772ac 100644 --- a/net/dns/mapped_host_resolver_unittest.cc +++ b/net/dns/mapped_host_resolver_unittest.cc @@ -8,7 +8,6 @@ #include "net/base/address_list.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/dns/mock_host_resolver.h" #include "net/log/net_log.h" diff --git a/net/dns/mdns_client.cc b/net/dns/mdns_client.cc index 04f995b..109a836 100644 --- a/net/dns/mdns_client.cc +++ b/net/dns/mdns_client.cc @@ -5,7 +5,6 @@ #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/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc index 42ec6b9..b97c51b 100644 --- a/net/dns/mock_host_resolver.cc +++ b/net/dns/mock_host_resolver.cc @@ -19,7 +19,6 @@ #include "base/threading/platform_thread.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/dns/host_cache.h" diff --git a/net/dns/mojo_host_resolver_impl_unittest.cc b/net/dns/mojo_host_resolver_impl_unittest.cc index 543a172..6816a6b 100644 --- a/net/dns/mojo_host_resolver_impl_unittest.cc +++ b/net/dns/mojo_host_resolver_impl_unittest.cc @@ -14,7 +14,6 @@ #include "mojo/public/cpp/bindings/interface_request.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/dns/mock_host_resolver.h" #include "net/dns/mojo_host_type_converters.h" #include "net/log/net_log.h" diff --git a/net/dns/mojo_host_type_converters.cc b/net/dns/mojo_host_type_converters.cc index 4d0eabf..2e404e0 100644 --- a/net/dns/mojo_host_type_converters.cc +++ b/net/dns/mojo_host_type_converters.cc @@ -8,7 +8,6 @@ #include "mojo/public/cpp/bindings/type_converter.h" #include "net/base/address_list.h" -#include "net/base/net_util.h" namespace net { namespace { diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc index ec1dc20..c1b98c8 100644 --- a/net/ftp/ftp_network_transaction_unittest.cc +++ b/net/ftp/ftp_network_transaction_unittest.cc @@ -13,7 +13,6 @@ #include "base/strings/utf_string_conversions.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/dns/mock_host_resolver.h" #include "net/ftp/ftp_request_info.h" diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc index 1c3352c9..d70d884 100644 --- a/net/http/http_auth_gssapi_posix.cc +++ b/net/http/http_auth_gssapi_posix.cc @@ -16,7 +16,6 @@ #include "base/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/http_auth_multi_round_parse.h" // These are defined for the GSSAPI library: diff --git a/net/http/http_auth_handler_ntlm_win.cc b/net/http/http_auth_handler_ntlm_win.cc index 7aca5f0..58e563b 100644 --- a/net/http/http_auth_handler_ntlm_win.cc +++ b/net/http/http_auth_handler_ntlm_win.cc @@ -11,7 +11,6 @@ #include "base/strings/string_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/http_auth_preferences.h" #include "net/http/http_auth_sspi_win.h" diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc index bef2d44..90d051d 100644 --- a/net/http/http_content_disposition.cc +++ b/net/http/http_content_disposition.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "net/base/escape.h" #include "net/base/net_string_util.h" -#include "net/base/net_util.h" #include "net/http/http_util.h" namespace net { diff --git a/net/http/http_network_transaction_ssl_unittest.cc b/net/http/http_network_transaction_ssl_unittest.cc index 51f3406..84095cf 100644 --- a/net/http/http_network_transaction_ssl_unittest.cc +++ b/net/http/http_network_transaction_ssl_unittest.cc @@ -7,7 +7,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "net/base/net_util.h" #include "net/base/request_priority.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_mock.h" diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc index 562bff3..a5f7107 100644 --- a/net/http/http_proxy_client_socket.cc +++ b/net/http/http_proxy_client_socket.cc @@ -13,7 +13,6 @@ #include "net/base/auth.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "net/base/proxy_delegate.h" #include "net/http/http_basic_stream.h" #include "net/http/http_network_session.h" diff --git a/net/http/http_proxy_client_socket_wrapper.cc b/net/http/http_proxy_client_socket_wrapper.cc index d159518..8184a7d 100644 --- a/net/http/http_proxy_client_socket_wrapper.cc +++ b/net/http/http_proxy_client_socket_wrapper.cc @@ -12,7 +12,6 @@ #include "base/memory/weak_ptr.h" #include "base/profiler/scoped_tracker.h" #include "base/values.h" -#include "net/base/net_util.h" #include "net/base/proxy_delegate.h" #include "net/http/http_proxy_client_socket.h" #include "net/http/http_response_info.h" diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc index 4931e9a..962f513 100644 --- a/net/http/http_stream_factory_impl.cc +++ b/net/http/http_stream_factory_impl.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_util.h" -#include "net/base/net_util.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties.h" #include "net/http/http_stream_factory_impl_job.h" diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index f4fbca1..1d09da7 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc @@ -24,7 +24,6 @@ #include "base/values.h" #include "build/build_config.h" #include "net/base/connection_type_histograms.h" -#include "net/base/net_util.h" #include "net/base/port_util.h" #include "net/cert/cert_verifier.h" #include "net/http/http_basic_stream.h" diff --git a/net/http/proxy_client_socket.cc b/net/http/proxy_client_socket.cc index 3b36ed8..3a7947c 100644 --- a/net/http/proxy_client_socket.cc +++ b/net/http/proxy_client_socket.cc @@ -8,7 +8,6 @@ #include "base/strings/stringprintf.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/http_auth_controller.h" #include "net/http/http_request_info.h" #include "net/http/http_response_headers.h" diff --git a/net/net.gypi b/net/net.gypi index b9460e5..b6ff525 100644 --- a/net/net.gypi +++ b/net/net.gypi @@ -47,8 +47,6 @@ 'base/net_module.cc', 'base/net_module.h', 'base/net_string_util.h', - 'base/net_util.cc', - 'base/net_util.h', 'base/network_interfaces.cc', 'base/network_interfaces.h', 'base/network_interfaces_posix.cc', @@ -1337,7 +1335,6 @@ 'base/lookup_string_in_fixed_set_unittest.cc', 'base/mime_sniffer_unittest.cc', 'base/mime_util_unittest.cc', - 'base/net_util_unittest.cc', 'base/network_activity_monitor_unittest.cc', 'base/network_change_notifier_unittest.cc', 'base/network_change_notifier_win_unittest.cc', @@ -1353,7 +1350,7 @@ 'base/static_cookie_policy_unittest.cc', 'base/test_completion_callback_unittest.cc', 'base/test_proxy_delegate.cc', - 'base/test_proxy_delegate.h', + 'base/test_proxy_delegate.h', 'base/upload_bytes_element_reader_unittest.cc', 'base/upload_file_element_reader_unittest.cc', 'base/url_util_unittest.cc', diff --git a/net/quic/quic_address_mismatch_test.cc b/net/quic/quic_address_mismatch_test.cc index 3bb9472..1946baf 100644 --- a/net/quic/quic_address_mismatch_test.cc +++ b/net/quic/quic_address_mismatch_test.cc @@ -5,7 +5,6 @@ #include "net/quic/quic_address_mismatch.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc index bda95d1..545cf33 100644 --- a/net/server/http_server_unittest.cc +++ b/net/server/http_server_unittest.cc @@ -30,7 +30,6 @@ #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/test_completion_callback.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" diff --git a/net/socket/socket_net_log_params.cc b/net/socket/socket_net_log_params.cc index 37be0a6..347644a 100644 --- a/net/socket/socket_net_log_params.cc +++ b/net/socket/socket_net_log_params.cc @@ -10,7 +10,6 @@ #include "base/values.h" #include "net/base/host_port_pair.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" namespace net { diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc index 20baaf2..bcc4259 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc @@ -13,7 +13,6 @@ #include "base/sys_byteorder.h" #include "base/trace_event/trace_event.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "net/log/net_log.h" #include "net/socket/client_socket_handle.h" diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc index 633f12e..ce5daac 100644 --- a/net/socket/socks_client_socket.cc +++ b/net/socket/socks_client_socket.cc @@ -11,7 +11,6 @@ #include "base/compiler_specific.h" #include "base/sys_byteorder.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "net/log/net_log.h" #include "net/socket/client_socket_handle.h" diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc index 700fa1c..d52f08c 100644 --- a/net/socket/tcp_client_socket.cc +++ b/net/socket/tcp_client_socket.cc @@ -14,7 +14,6 @@ #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" namespace net { diff --git a/net/socket/tcp_client_socket_unittest.cc b/net/socket/tcp_client_socket_unittest.cc index 5e0d948..04c0a59 100644 --- a/net/socket/tcp_client_socket_unittest.cc +++ b/net/socket/tcp_client_socket_unittest.cc @@ -10,7 +10,6 @@ #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/socket/tcp_server_socket.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc index 0140c25..37333db 100644 --- a/net/socket/transport_client_socket_pool_test_util.cc +++ b/net/socket/transport_client_socket_pool_test_util.cc @@ -18,7 +18,6 @@ #include "net/base/ip_endpoint.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" -#include "net/base/net_util.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/udp/datagram_client_socket.h" diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index aeab2b1..5fa1dec 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -14,7 +14,6 @@ #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/dns/mock_host_resolver.h" #include "net/log/test_net_log.h" diff --git a/net/socket/websocket_transport_client_socket_pool_unittest.cc b/net/socket/websocket_transport_client_socket_pool_unittest.cc index e45dcc2..bbc9de8 100644 --- a/net/socket/websocket_transport_client_socket_pool_unittest.cc +++ b/net/socket/websocket_transport_client_socket_pool_unittest.cc @@ -21,7 +21,6 @@ #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/dns/mock_host_resolver.h" #include "net/log/test_net_log.h" diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc index 9e07d84..5a3a0cb 100644 --- a/net/spdy/spdy_http_stream.cc +++ b/net/spdy/spdy_http_stream.cc @@ -17,7 +17,6 @@ #include "base/thread_task_runner_handle.h" #include "base/values.h" #include "net/base/host_port_pair.h" -#include "net/base/net_util.h" #include "net/base/upload_data_stream.h" #include "net/http/http_request_headers.h" #include "net/http/http_request_info.h" diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc index 013c9f6..39ef8f0 100644 --- a/net/spdy/spdy_proxy_client_socket.cc +++ b/net/spdy/spdy_proxy_client_socket.cc @@ -18,7 +18,6 @@ #include "base/values.h" #include "net/base/auth.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "net/http/http_auth_cache.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_request_info.h" diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 697ce7ca..ed5f16d9 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -29,7 +29,6 @@ #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" #include "net/base/connection_type_histograms.h" -#include "net/base/net_util.h" #include "net/base/proxy_delegate.h" #include "net/cert/asn1_util.h" #include "net/cert/cert_verify_result.h" diff --git a/net/tools/flip_server/url_to_filename_encoder.cc b/net/tools/flip_server/url_to_filename_encoder.cc index b3d80e4..b5a01d1 100644 --- a/net/tools/flip_server/url_to_filename_encoder.cc +++ b/net/tools/flip_server/url_to_filename_encoder.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/strings/string_util.h" -#include "net/base/net_util.h" using std::string; diff --git a/net/udp/udp_socket_perftest.cc b/net/udp/udp_socket_perftest.cc index 066ec28..26c14cf 100644 --- a/net/udp/udp_socket_perftest.cc +++ b/net/udp/udp_socket_perftest.cc @@ -10,7 +10,6 @@ #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/test_completion_callback.h" #include "net/test/net_test_suite.h" #include "net/udp/udp_client_socket.h" diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc index 4bd8a9e..2782ba9 100644 --- a/net/udp/udp_socket_unittest.cc +++ b/net/udp/udp_socket_unittest.cc @@ -18,7 +18,6 @@ #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/test_completion_callback.h" #include "net/log/test_net_log.h" #include "net/log/test_net_log_entry.h" diff --git a/net/url_request/url_request_file_job_unittest.cc b/net/url_request/url_request_file_job_unittest.cc index d8e0691..da43aab 100644 --- a/net/url_request/url_request_file_job_unittest.cc +++ b/net/url_request/url_request_file_job_unittest.cc @@ -13,7 +13,6 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" #include "net/base/filename_util.h" -#include "net/base/net_util.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index fd59e45..9d8dd49 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -13,7 +13,6 @@ #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/ftp/ftp_auth_cache.h" #include "net/ftp/ftp_response_info.h" #include "net/ftp/ftp_transaction_factory.h" diff --git a/net/url_request/url_request_throttler_manager.cc b/net/url_request/url_request_throttler_manager.cc index 3f08e9e..a36f0c9 100644 --- a/net/url_request/url_request_throttler_manager.cc +++ b/net/url_request/url_request_throttler_manager.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/strings/string_util.h" -#include "net/base/net_util.h" +#include "net/base/url_util.h" #include "net/log/net_log.h" namespace net { diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc index 880d724..b874426 100644 --- a/remoting/host/daemon_process.cc +++ b/remoting/host/daemon_process.cc @@ -16,7 +16,6 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" #include "ipc/attachment_broker_privileged.h" -#include "net/base/net_util.h" #include "remoting/base/auto_thread_task_runner.h" #include "remoting/host/branding.h" #include "remoting/host/chromoting_messages.h" diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc index 7b541a6..0a5ede1 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc @@ -18,7 +18,6 @@ #include "base/strings/stringize_macros.h" #include "base/values.h" #include "net/base/file_stream.h" -#include "net/base/net_util.h" #include "remoting/base/auto_thread_task_runner.h" #include "remoting/host/chromoting_host_context.h" #include "remoting/host/native_messaging/log_message_handler.h" diff --git a/remoting/protocol/fake_datagram_socket.cc b/remoting/protocol/fake_datagram_socket.cc index 4d5280d..cb83746 100644 --- a/remoting/protocol/fake_datagram_socket.cc +++ b/remoting/protocol/fake_datagram_socket.cc @@ -14,7 +14,6 @@ #include "net/base/address_list.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace remoting { diff --git a/remoting/protocol/fake_stream_socket.cc b/remoting/protocol/fake_stream_socket.cc index 545b46a..547e2bd 100644 --- a/remoting/protocol/fake_stream_socket.cc +++ b/remoting/protocol/fake_stream_socket.cc @@ -14,7 +14,6 @@ #include "net/base/address_list.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace remoting { diff --git a/remoting/protocol/jingle_info_request.cc b/remoting/protocol/jingle_info_request.cc index 9644a8f2..b804499 100644 --- a/remoting/protocol/jingle_info_request.cc +++ b/remoting/protocol/jingle_info_request.cc @@ -11,7 +11,6 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" -#include "net/base/net_util.h" #include "remoting/protocol/ice_config.h" #include "remoting/signaling/iq_sender.h" #include "third_party/webrtc/base/socketaddress.h" diff --git a/remoting/protocol/pseudotcp_adapter.cc b/remoting/protocol/pseudotcp_adapter.cc index 464d359..9992ef2 100644 --- a/remoting/protocol/pseudotcp_adapter.cc +++ b/remoting/protocol/pseudotcp_adapter.cc @@ -17,7 +17,6 @@ #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "remoting/protocol/p2p_datagram_socket.h" using cricket::PseudoTcp; diff --git a/storage/browser/fileapi/file_system_quota_client.cc b/storage/browser/fileapi/file_system_quota_client.cc index b988a99..f6cab0d 100644 --- a/storage/browser/fileapi/file_system_quota_client.cc +++ b/storage/browser/fileapi/file_system_quota_client.cc @@ -14,7 +14,6 @@ #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/task_runner_util.h" -#include "net/base/net_util.h" #include "storage/browser/fileapi/file_system_context.h" #include "storage/browser/fileapi/file_system_usage_cache.h" #include "storage/browser/fileapi/sandbox_file_system_backend.h" diff --git a/storage/browser/fileapi/file_system_url_request_job.cc b/storage/browser/fileapi/file_system_url_request_job.cc index 48ce68e7..28b9ea6 100644 --- a/storage/browser/fileapi/file_system_url_request_job.cc +++ b/storage/browser/fileapi/file_system_url_request_job.cc @@ -21,7 +21,6 @@ #include "net/base/io_buffer.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/http/http_util.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc index 9cd070a..009c3ee 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc @@ -6,7 +6,6 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "net/base/net_util.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/dragdrop/file_info.h" |