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 /android_webview | |
| 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 'android_webview')
| -rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc index 0d9c5fd..421ac51 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -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" |