summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authoreroman <eroman@chromium.org>2015-04-02 10:23:31 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-02 17:24:10 +0000
commit58e913aa2a031aab0d082d3380c49e1b5881eba4 (patch)
tree10073cf6d01bba9ca2020e24c7da9c1b00c564d7 /content/browser
parent641f1a744de0734fc5299abbf72b726967f24d55 (diff)
downloadchromium_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 'content/browser')
-rw-r--r--content/browser/appcache/appcache_url_request_job.cc2
-rw-r--r--content/browser/devtools/devtools_netlog_observer.h2
-rw-r--r--content/browser/download/base_file.h2
-rw-r--r--content/browser/download/download_create_info.h2
-rw-r--r--content/browser/download/download_file_impl.h2
-rw-r--r--content/browser/download/download_item_impl.h2
-rw-r--r--content/browser/download/download_manager_impl_unittest.cc2
-rw-r--r--content/browser/download/download_net_log_parameters.h2
-rw-r--r--content/browser/loader/async_resource_handler.cc2
-rw-r--r--content/browser/media/media_internals_proxy.h2
-rw-r--r--content/browser/renderer_host/p2p/socket_dispatcher_host.cc2
11 files changed, 11 insertions, 11 deletions
diff --git a/content/browser/appcache/appcache_url_request_job.cc b/content/browser/appcache/appcache_url_request_job.cc
index e253f4a..fc628c8 100644
--- a/content/browser/appcache/appcache_url_request_job.cc
+++ b/content/browser/appcache/appcache_url_request_job.cc
@@ -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"
diff --git a/content/browser/devtools/devtools_netlog_observer.h b/content/browser/devtools/devtools_netlog_observer.h
index 2155f06..da58589 100644
--- a/content/browser/devtools/devtools_netlog_observer.h
+++ b/content/browser/devtools/devtools_netlog_observer.h
@@ -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;
diff --git a/content/browser/download/base_file.h b/content/browser/download/base_file.h
index 037aecc..9016755 100644
--- a/content/browser/download/base_file.h
+++ b/content/browser/download/base_file.h
@@ -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 {
diff --git a/content/browser/download/download_create_info.h b/content/browser/download/download_create_info.h
index cbf8711..7bf03ab 100644
--- a/content/browser/download/download_create_info.h
+++ b/content/browser/download/download_create_info.h
@@ -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"
diff --git a/content/browser/download/download_file_impl.h b/content/browser/download/download_file_impl.h
index 9ff3f85..8d192c2 100644
--- a/content/browser/download/download_file_impl.h
+++ b/content/browser/download/download_file_impl.h
@@ -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;
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h
index b6394f7..50b3dbd 100644
--- a/content/browser/download/download_item_impl.h
+++ b/content/browser/download/download_item_impl.h
@@ -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 {
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 8b8fb7d..52adff4 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -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"
diff --git a/content/browser/download/download_net_log_parameters.h b/content/browser/download/download_net_log_parameters.h
index 1c12b8d..6d027cf 100644
--- a/content/browser/download/download_net_log_parameters.h
+++ b/content/browser/download/download_net_log_parameters.h
@@ -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;
diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc
index 364d11f..f0268e7 100644
--- a/content/browser/loader/async_resource_handler.cc
+++ b/content/browser/loader/async_resource_handler.cc
@@ -28,8 +28,8 @@
#include "content/public/common/resource_response.h"
#include "net/base/io_buffer.h"
#include "net/base/load_flags.h"
-#include "net/base/net_log.h"
#include "net/base/net_util.h"
+#include "net/log/net_log.h"
#include "net/url_request/redirect_info.h"
using base::TimeTicks;
diff --git a/content/browser/media/media_internals_proxy.h b/content/browser/media/media_internals_proxy.h
index c2672f0..af6740c 100644
--- a/content/browser/media/media_internals_proxy.h
+++ b/content/browser/media/media_internals_proxy.h
@@ -11,7 +11,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-#include "net/base/net_log.h"
+#include "net/log/net_log.h"
namespace base {
class ListValue;
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
index 3a2a5ea..04a097e 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
@@ -13,9 +13,9 @@
#include "net/base/address_list.h"
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
-#include "net/base/net_log.h"
#include "net/base/sys_addrinfo.h"
#include "net/dns/single_request_host_resolver.h"
+#include "net/log/net_log.h"
#include "net/url_request/url_request_context_getter.h"
using content::BrowserMessageFilter;