Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5139006

TBR=thestig@chromium.org
Review URL: http://codereview.chromium.org/5270010

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

8 files changed, 5 insertions, 11 deletions

diff --git a/remoting/base/codec_test.cc b/remoting/base/codec_test.cc
index 891d4df..dcc165e 100644
--- a/remoting/base/codec_test.cc
+++ b/remoting/base/codec_test.cc
@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdlib.h>
-
 #include <deque>
+#include <stdlib.h>
 
-#include "base/task.h"
 #include "gfx/rect.h"
 #include "media/base/video_frame.h"
 #include "remoting/base/codec_test.h"
@@ -155,7 +153,7 @@ class EncoderMessageTester {
 
 class DecoderTester {
  public:
-  explicit DecoderTester(Decoder* decoder)
+  DecoderTester(Decoder* decoder)
       : strict_(false),
         decoder_(decoder),
         decode_done_(false) {
diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h
index 2412a7e..bcb5a54 100644
--- a/remoting/base/decoder.h
+++ b/remoting/base/decoder.h
@@ -7,13 +7,12 @@
 
 #include <vector>
 
+#include "base/task.h"
 #include "base/scoped_ptr.h"
 #include "gfx/rect.h"
 #include "media/base/video_frame.h"
 #include "remoting/proto/video.pb.h"
 
-class Task;
-
 namespace remoting {
 
 typedef std::vector<gfx::Rect> UpdatedRects;
diff --git a/remoting/base/decoder_row_based.cc b/remoting/base/decoder_row_based.cc
index 880cacf..8e34e1d 100644
--- a/remoting/base/decoder_row_based.cc
+++ b/remoting/base/decoder_row_based.cc
@@ -4,7 +4,6 @@
 
 #include "remoting/base/decoder_row_based.h"
 
-#include "base/logging.h"
 #include "remoting/base/decompressor.h"
 #include "remoting/base/decompressor_zlib.h"
 #include "remoting/base/decompressor_verbatim.h"
diff --git a/remoting/base/decoder_vp8.cc b/remoting/base/decoder_vp8.cc
index 8f0ce16..516e9f4 100644
--- a/remoting/base/decoder_vp8.cc
+++ b/remoting/base/decoder_vp8.cc
@@ -4,7 +4,6 @@
 
 #include "remoting/base/decoder_vp8.h"
 
-#include "base/logging.h"
 #include "media/base/media.h"
 #include "media/base/yuv_convert.h"
 #include "remoting/base/util.h"
diff --git a/remoting/host/capturer.h b/remoting/host/capturer.h
index 08fb077..548b685 100644
--- a/remoting/host/capturer.h
+++ b/remoting/host/capturer.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/lock.h"
+#include "base/task.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/types.h"
 
diff --git a/remoting/host/capturer_linux.cc b/remoting/host/capturer_linux.cc
index 4bd188a..70c956d 100644
--- a/remoting/host/capturer_linux.cc
+++ b/remoting/host/capturer_linux.cc
@@ -10,7 +10,6 @@
 
 #include <set>
 
-#include "base/logging.h"
 #include "remoting/base/types.h"
 
 namespace remoting {
diff --git a/remoting/host/capturer_mac.cc b/remoting/host/capturer_mac.cc
index 4d947fc..9cd0e75 100644
--- a/remoting/host/capturer_mac.cc
+++ b/remoting/host/capturer_mac.cc
@@ -8,8 +8,6 @@
 
 #include <OpenGL/CGLMacro.h>
 
-#include "base/logging.h"
-
 namespace remoting {
 
 CapturerMac::CapturerMac(MessageLoop* message_loop)
diff --git a/remoting/host/session_manager_unittest.cc b/remoting/host/session_manager_unittest.cc
index 63d1116..967d778 100644
--- a/remoting/host/session_manager_unittest.cc
+++ b/remoting/host/session_manager_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
+#include "base/task.h"
 #include "remoting/base/mock_objects.h"
 #include "remoting/host/mock_objects.h"
 #include "remoting/host/session_manager.h"