Attempt four at landing the "histogram.h removed from message_loop.h" patch.

Previously committed as r52349 and r52336. Related commits: r52367, r52364
and r52343.

Rerunning trybots due to previous trybot breakage.

TEST=none
BUG=none

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

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

8 files changed, 14 insertions, 5 deletions

diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h
index 2f95f7c..cad2d26 100644
--- a/net/base/capturing_net_log.h
+++ b/net/base/capturing_net_log.h
@@ -10,6 +10,7 @@
 #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 2036260..ba91db2 100644
--- a/net/base/file_stream_posix.cc
+++ b/net/base/file_stream_posix.cc
@@ -17,6 +17,7 @@
 #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 8b7f090..0460b3d 100644
--- a/net/base/file_stream_win.cc
+++ b/net/base/file_stream_win.cc
@@ -1,12 +1,13 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.  Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #include "net/base/file_stream.h"
 
 #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 5685fc4..9b19436 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -17,6 +17,7 @@
 #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 7adea1e..d43364a 100644
--- a/net/base/listen_socket_unittest.h
+++ b/net/base/listen_socket_unittest.h
@@ -16,6 +16,7 @@
 #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 ace4a53..bd62f91 100644
--- a/net/base/net_log.cc
+++ b/net/base/net_log.cc
@@ -4,6 +4,7 @@
 
 #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 2f82ed4..266b93a 100644
--- a/net/base/net_log.h
+++ b/net/base/net_log.h
@@ -10,11 +10,13 @@
 
 #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 f60afcc..c7b6a6f 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -33,6 +33,7 @@
 #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"