Skip to content

Commit

Permalink
Update remaining code to include NetLog files from net/log directory …
Browse files Browse the repository at this point in the history 
…rather than net/base.

(Some files in net/base got moved to net/log)

BUG=434856
TBR=armansito@chromium.org,jam@chromium.org

Review URL: https://codereview.chromium.org/1050923005

Cr-Commit-Position: refs/heads/master@{#323525}
  • Loading branch information
eroman authored and Commit bot committed Apr 2, 2015
1 parent 641f1a7 commit 58e913a
Show file tree
Hide file tree
Showing 61 changed files with 63 additions and 110 deletions.
4 changes: 2 additions & 2 deletions android_webview/browser/net/aw_url_request_context_getter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
#include "net/base/cache_type.h"
#include "net/base/net_log.h"
#include "net/cookies/cookie_store.h"
#include "net/dns/mapped_host_resolver.h"
#include "net/http/http_cache.h"
#include "net/http/http_stream_factory.h"
#include "net/log/net_log.h"
#include "net/proxy/proxy_service.h"
#include "net/socket/next_proto.h"
#include "net/ssl/channel_id_service.h"
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
#include "net/url_request/url_request_interceptor.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "crypto/nss_util_internal.h"
#include "crypto/scoped_test_nss_chromeos_user.h"
#include "net/base/net_log.h"
#include "net/base/test_completion_callback.h"
#include "net/base/test_data_directory.h"
#include "net/cert/cert_trust_anchor_provider.h"
#include "net/cert/cert_verify_result.h"
#include "net/cert/nss_cert_database_chromeos.h"
#include "net/cert/x509_certificate.h"
#include "net/log/net_log.h"
#include "net/test/cert_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/dial/dial_service.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "base/observer_list.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "net/udp/udp_socket.h"

namespace net {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/dial/dial_service_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "base/message_loop/message_loop.h"
#include "chrome/browser/extensions/api/dial/dial_device_data.h"
#include "chrome/browser/extensions/api/dial/dial_service.h"
#include "net/base/capturing_net_log.h"
#include "net/base/ip_endpoint.h"
#include "net/log/capturing_net_log.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/extensions/api/log_private/log_private_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "extensions/browser/api/api_resource_manager.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
#include "extensions/browser/extension_registry_observer.h"
#include "net/base/net_log.h"
#include "net/base/net_log_logger.h"
#include "net/log/net_log.h"
#include "net/log/net_log_logger.h"

class IOThread;

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
#include "extensions/common/extension_messages.h"
#include "extensions/common/features/feature.h"
#include "net/base/auth.h"
#include "net/base/capturing_net_log.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"
#include "net/dns/mock_host_resolver.h"
#include "net/log/capturing_net_log.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest-message.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/local_discovery/privet_traffic_detector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#include "base/sys_byteorder.h"
#include "net/base/dns_util.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/dns/dns_protocol.h"
#include "net/dns/dns_response.h"
#include "net/dns/mdns_client.h"
#include "net/log/net_log.h"
#include "net/udp/datagram_server_socket.h"
#include "net/udp/udp_server_socket.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/safe_browsing/safe_browsing_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_utils.h"
#include "net/base/load_flags.h"
#include "net/base/net_log.h"
#include "net/dns/host_resolver.h"
#include "net/log/net_log.h"
#include "net/test/python_utils.h"
#include "net/url_request/url_fetcher.h"
#include "net/url_request/url_fetcher_delegate.h"
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
#include "content/public/browser/web_ui_message_handler.h"
#include "net/base/address_list.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/base/net_log_logger.h"
#include "net/dns/host_cache.h"
#include "net/dns/host_resolver.h"
#include "net/dns/mock_host_resolver.h"
#include "net/http/http_network_session.h"
#include "net/http/http_transaction_factory.h"
#include "net/log/net_log.h"
#include "net/log/net_log_logger.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/test/chromedriver/net/port_server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include "base/sync_socket.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.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"

#if defined(OS_LINUX)
Expand Down
2 changes: 1 addition & 1 deletion components/cronet/android/cronet_url_request_context_adapter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include "jni/CronetUrlRequestContext_jni.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
#include "net/base/net_log_logger.h"
#include "net/base/network_delegate_impl.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/log/net_log_logger.h"
#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
Expand Down
2 changes: 1 addition & 1 deletion components/cronet/android/url_request_context_adapter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
#include "components/cronet/url_request_context_config.h"
#include "net/android/network_change_notifier_factory_android.h"
#include "net/base/net_errors.h"
#include "net/base/net_log_logger.h"
#include "net/base/net_util.h"
#include "net/base/network_change_notifier.h"
#include "net/base/network_delegate_impl.h"
#include "net/cert/cert_verifier.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_network_layer.h"
#include "net/http/http_server_properties.h"
#include "net/log/net_log_logger.h"
#include "net/proxy/proxy_service.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/url_request/static_http_user_agent_settings.h"
Expand Down
2 changes: 1 addition & 1 deletion components/cronet/android/url_request_context_adapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"

Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
#include "net/base/host_port_pair.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/base/request_priority.h"
#include "net/dns/mock_host_resolver.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_util.h"
#include "net/log/net_log.h"
#include "net/socket/socket_test_util.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context_getter.h"
Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/base/net_util.h"
#include "net/base/network_change_notifier.h"
#include "net/log/net_log.h"
#include "net/proxy/proxy_config.h"
#include "net/proxy/proxy_retry_info.h"

Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
#include "net/base/capturing_net_log.h"
#include "net/log/capturing_net_log.h"
#include "net/proxy/proxy_server.h"
#include "net/url_request/test_url_fetcher_factory.h"
#include "net/url_request/url_request_test_util.h"
Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/test/test_simple_task_runner.h"
#include "base/values.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
#include "net/base/capturing_net_log.h"
#include "net/log/capturing_net_log.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
#include "net/base/capturing_net_log.h"
#include "net/base/net_errors.h"
#include "net/base/request_priority.h"
#include "net/http/http_response_headers.h"
#include "net/log/capturing_net_log.h"
#include "net/proxy/proxy_server.h"
#include "net/socket/socket_test_util.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"

namespace data_reduction_proxy {

Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "net/url_request/url_request_interceptor.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
#include "net/base/load_flags.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "net/proxy/proxy_server.h"
#include "net/proxy/proxy_service.h"
#include "net/socket/socket_test_util.h"
Expand Down
4 changes: 2 additions & 2 deletions ...nents/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers_test_utils.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
#include "net/base/capturing_net_log.h"
#include "net/base/host_port_pair.h"
#include "net/base/load_flags.h"
#include "net/base/net_log.h"
#include "net/http/http_response_headers.h"
#include "net/log/capturing_net_log.h"
#include "net/log/net_log.h"
#include "net/proxy/proxy_config.h"
#include "net/proxy/proxy_server.h"
#include "net/url_request/url_request.h"
Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/prefs/testing_pref_service.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
#include "net/base/capturing_net_log.h"
#include "net/base/net_util.h"
#include "net/log/capturing_net_log.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"
Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h"
#include "net/base/backoff_entry.h"
#include "net/base/capturing_net_log.h"
#include "net/log/capturing_net_log.h"
#include "testing/gmock/include/gmock/gmock.h"

class TestingPrefServiceSimple;
Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "base/time/time.h"
#include "base/values.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "net/proxy/proxy_server.h"
#include "url/gurl.h"

Expand Down
2 changes: 1 addition & 1 deletion components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"

class GURL;

Expand Down
4 changes: 2 additions & 2 deletions components/data_reduction_proxy/core/common/data_reduction_proxy_event_store_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/test/test_simple_task_runner.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
#include "net/base/capturing_net_log.h"
#include "net/base/net_log.h"
#include "net/log/capturing_net_log.h"
#include "net/log/net_log.h"
#include "testing/gtest/include/gtest/gtest.h"

namespace data_reduction_proxy {
Expand Down
2 changes: 1 addition & 1 deletion components/gcm_driver/gcm_client_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "google_apis/gcm/engine/unregistration_request.h"
#include "google_apis/gcm/protocol/android_checkin.pb.h"
#include "google_apis/gcm/protocol/checkin.pb.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "net/url_request/url_request_context_getter.h"

class GURL;
Expand Down
2 changes: 1 addition & 1 deletion content/browser/appcache/appcache_url_request_job.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include "content/browser/appcache/appcache_service_impl.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_util.h"
#include "net/log/net_log.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_status.h"

Expand Down
2 changes: 1 addition & 1 deletion content/browser/devtools/devtools_netlog_observer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "base/containers/hash_tables.h"
#include "base/memory/ref_counted.h"
#include "content/public/common/resource_devtools_info.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"

namespace net {
class URLRequest;
Expand Down
2 changes: 1 addition & 1 deletion content/browser/download/base_file.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "content/public/browser/download_interrupt_reasons.h"
#include "crypto/sha2.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "url/gurl.h"

namespace crypto {
Expand Down
2 changes: 1 addition & 1 deletion content/browser/download/download_create_info.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "content/browser/download/download_request_handle.h"
#include "content/common/content_export.h"
#include "content/public/browser/download_save_info.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "ui/base/page_transition_types.h"
#include "url/gurl.h"

Expand Down
2 changes: 1 addition & 1 deletion content/browser/download/download_file_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "content/browser/download/base_file.h"
#include "content/browser/download/rate_estimator.h"
#include "content/public/browser/download_save_info.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"

namespace content {
class ByteStreamReader;
Expand Down
2 changes: 1 addition & 1 deletion content/browser/download/download_item_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "content/public/browser/download_destination_observer.h"
#include "content/public/browser/download_interrupt_reasons.h"
#include "content/public/browser/download_item.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"
#include "url/gurl.h"

namespace content {
Expand Down
2 changes: 1 addition & 1 deletion content/browser/download/download_manager_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#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_log.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"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion content/browser/download/download_net_log_parameters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "content/public/browser/download_item.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/log/net_log.h"

class GURL;

Expand Down
Loading

0 comments on commit 58e913a

Please sign in to comment.