summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 21:39:48 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 21:39:48 +0000
commit1407b6eecf2fe8475e52ed628ac4ad57e1f0c1c0 (patch)
tree61cd89f2c6812566e74c83de1c21f9748da996f8 /media
parent396850c6a064652cf2e9afe45a2582553e80d2b8 (diff)
downloadchromium_src-1407b6eecf2fe8475e52ed628ac4ad57e1f0c1c0.zip
chromium_src-1407b6eecf2fe8475e52ed628ac4ad57e1f0c1c0.tar.gz
chromium_src-1407b6eecf2fe8475e52ed628ac4ad57e1f0c1c0.tar.bz2
FBTF: Remove unneeded headers from base/ (part 7)
BUG=none TEST=none Review URL: http://codereview.chromium.org/3176026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_output_controller_unittest.cc1
-rw-r--r--media/audio/linux/alsa_output_unittest.cc1
-rw-r--r--media/base/buffers.h2
-rw-r--r--media/base/video_frame.cc2
-rw-r--r--media/ffmpeg/file_protocol.cc1
-rw-r--r--media/filters/audio_renderer_algorithm_base.cc1
-rw-r--r--media/filters/audio_renderer_algorithm_ola.cc1
-rw-r--r--media/filters/bitstream_converter.cc1
-rw-r--r--media/filters/bitstream_converter.h3
-rw-r--r--media/filters/ffmpeg_video_allocator.cc2
-rw-r--r--media/filters/ffmpeg_video_allocator.h1
11 files changed, 10 insertions, 6 deletions
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index df96f4a..9383c9d 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -4,6 +4,7 @@
#include "base/environment.h"
#include "base/basictypes.h"
+#include "base/logging.h"
#include "base/waitable_event.h"
#include "media/audio/audio_output_controller.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc
index f0aefe6..7d3a283 100644
--- a/media/audio/linux/alsa_output_unittest.cc
+++ b/media/audio/linux/alsa_output_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/logging.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "media/audio/linux/alsa_output.h"
diff --git a/media/base/buffers.h b/media/base/buffers.h
index d03717d..438799b2 100644
--- a/media/base/buffers.h
+++ b/media/base/buffers.h
@@ -27,7 +27,7 @@
#ifndef MEDIA_BASE_BUFFERS_H_
#define MEDIA_BASE_BUFFERS_H_
-#include "base/logging.h"
+#include "base/basictypes.h"
#include "base/ref_counted.h"
#include "base/time.h"
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index e7da94e..b4fb5cf 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -4,6 +4,8 @@
#include "media/base/video_frame.h"
+#include "base/logging.h"
+
namespace media {
// static
diff --git a/media/ffmpeg/file_protocol.cc b/media/ffmpeg/file_protocol.cc
index d70a3dc..f778319 100644
--- a/media/ffmpeg/file_protocol.cc
+++ b/media/ffmpeg/file_protocol.cc
@@ -16,7 +16,6 @@
#include "base/compiler_specific.h"
#include "base/eintr_wrapper.h"
#include "base/file_util.h"
-#include "base/logging.h"
#include "media/ffmpeg/ffmpeg_common.h"
// warning C4996: 'open': The POSIX name for this item is deprecated.
diff --git a/media/filters/audio_renderer_algorithm_base.cc b/media/filters/audio_renderer_algorithm_base.cc
index 71ba5ce..5e4e2bbe 100644
--- a/media/filters/audio_renderer_algorithm_base.cc
+++ b/media/filters/audio_renderer_algorithm_base.cc
@@ -4,6 +4,7 @@
#include "media/filters/audio_renderer_algorithm_base.h"
+#include "base/logging.h"
#include "media/base/buffers.h"
namespace media {
diff --git a/media/filters/audio_renderer_algorithm_ola.cc b/media/filters/audio_renderer_algorithm_ola.cc
index d393c59..2d47c91 100644
--- a/media/filters/audio_renderer_algorithm_ola.cc
+++ b/media/filters/audio_renderer_algorithm_ola.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <cmath>
+#include "base/logging.h"
#include "media/base/buffers.h"
namespace media {
diff --git a/media/filters/bitstream_converter.cc b/media/filters/bitstream_converter.cc
index 0818caf..45a19ab 100644
--- a/media/filters/bitstream_converter.cc
+++ b/media/filters/bitstream_converter.cc
@@ -4,6 +4,7 @@
#include "media/filters/bitstream_converter.h"
+#include "base/logging.h"
#include "media/ffmpeg/ffmpeg_common.h"
namespace media {
diff --git a/media/filters/bitstream_converter.h b/media/filters/bitstream_converter.h
index 7417209..4f6a0d7 100644
--- a/media/filters/bitstream_converter.h
+++ b/media/filters/bitstream_converter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -14,7 +14,6 @@
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
-#include "base/logging.h"
// FFmpeg types.
struct AVBitStreamFilterContext;
diff --git a/media/filters/ffmpeg_video_allocator.cc b/media/filters/ffmpeg_video_allocator.cc
index 56aaa7c..63665f7 100644
--- a/media/filters/ffmpeg_video_allocator.cc
+++ b/media/filters/ffmpeg_video_allocator.cc
@@ -4,6 +4,7 @@
#include "media/filters/ffmpeg_video_allocator.h"
+#include "base/logging.h"
#include "media/ffmpeg/ffmpeg_common.h"
// Because Chromium could be build with FFMPEG version other than FFMPEG-MT
@@ -176,4 +177,3 @@ void FFmpegVideoAllocator::InternalReleaseBuffer(
}
} // namespace media
-
diff --git a/media/filters/ffmpeg_video_allocator.h b/media/filters/ffmpeg_video_allocator.h
index e2ff670..2cb1d742 100644
--- a/media/filters/ffmpeg_video_allocator.h
+++ b/media/filters/ffmpeg_video_allocator.h
@@ -5,6 +5,7 @@
#ifndef MEDIA_FILTERS_FFMPEG_VIDEO_ALLOCATOR_H_
#define MEDIA_FILTERS_FFMPEG_VIDEO_ALLOCATOR_H_
+#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "media/base/video_frame.h"
#include "media/ffmpeg/ffmpeg_common.h"