diff options
| author | eroman <eroman@chromium.org> | 2015-04-02 10:23:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-02 17:24:10 +0000 |
| commit | 58e913aa2a031aab0d082d3380c49e1b5881eba4 (patch) | |
| tree | 10073cf6d01bba9ca2020e24c7da9c1b00c564d7 /components/cronet | |
| parent | 641f1a744de0734fc5299abbf72b726967f24d55 (diff) | |
| download | chromium_src-58e913aa2a031aab0d082d3380c49e1b5881eba4.zip chromium_src-58e913aa2a031aab0d082d3380c49e1b5881eba4.tar.gz chromium_src-58e913aa2a031aab0d082d3380c49e1b5881eba4.tar.bz2 | |
Update remaining code to include NetLog files from net/log directory 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}
Diffstat (limited to 'components/cronet')
3 files changed, 3 insertions, 3 deletions
diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc index 1168f68..ef4e9f5c 100644 --- a/components/cronet/android/cronet_url_request_context_adapter.cc +++ b/components/cronet/android/cronet_url_request_context_adapter.cc @@ -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" diff --git a/components/cronet/android/url_request_context_adapter.cc b/components/cronet/android/url_request_context_adapter.cc index ebec623..611286c 100644 --- a/components/cronet/android/url_request_context_adapter.cc +++ b/components/cronet/android/url_request_context_adapter.cc @@ -14,7 +14,6 @@ #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" @@ -22,6 +21,7 @@ #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" diff --git a/components/cronet/android/url_request_context_adapter.h b/components/cronet/android/url_request_context_adapter.h index c479621..bc741f1 100644 --- a/components/cronet/android/url_request_context_adapter.h +++ b/components/cronet/android/url_request_context_adapter.h @@ -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" |