Revert 52336 - More header cleanup:

- Some cleanup to url_request.h
- Remove task.h from headers that don't need it.
- Remove histogram.h from message_loop.h

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/2986002

TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2969006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52343 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 2 insertions, 11 deletions

diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h
index cad2d26..2f95f7c 100644
--- a/net/base/capturing_net_log.h
+++ b/net/base/capturing_net_log.h
@@ -10,7 +10,6 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/time.h"
 #include "net/base/net_log.h"
 
 namespace net {
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc
index ba91db2..2036260 100644
--- a/net/base/file_stream_posix.cc
+++ b/net/base/file_stream_posix.cc
@@ -17,7 +17,6 @@
 #include "base/callback.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
-#include "base/histogram.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc
index a50e7aa..8b7f090 100644
--- a/net/base/file_stream_win.cc
+++ b/net/base/file_stream_win.cc
@@ -7,7 +7,6 @@
 #include <windows.h>
 
 #include "base/file_path.h"
-#include "base/histogram.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc
index 9b19436..5685fc4 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -17,7 +17,6 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/debug_util.h"
-#include "base/histogram.h"
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h
index d43364a..7adea1e 100644
--- a/net/base/listen_socket_unittest.h
+++ b/net/base/listen_socket_unittest.h
@@ -16,7 +16,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "base/basictypes.h"
 #include "base/message_loop.h"
diff --git a/net/base/net_log.cc b/net/base/net_log.cc
index bd62f91..ace4a53 100644
--- a/net/base/net_log.cc
+++ b/net/base/net_log.cc
@@ -4,7 +4,6 @@
 
 #include "net/base/net_log.h"
 #include "base/string_util.h"
-#include "base/time.h"
 #include "base/values.h"
 
 namespace net {
diff --git a/net/base/net_log.h b/net/base/net_log.h
index 266b93a..2f82ed4 100644
--- a/net/base/net_log.h
+++ b/net/base/net_log.h
@@ -10,13 +10,11 @@
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
+#include "base/time.h"
 
 class Value;
 
-namespace base {
-class TimeTicks;
-}
-
 namespace net {
 
 // NetLog is the destination for log messages generated by the network stack.
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index c7b6a6f..f60afcc 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -33,7 +33,6 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/histogram.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"