FBTF: More dtor deinlining. (Can almost see the end!)

BUG=none
TEST=compiles

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

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

12 files changed, 34 insertions, 9 deletions

diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc
index c0e4529..a60446a 100644
--- a/media/audio/fake_audio_input_stream.cc
+++ b/media/audio/fake_audio_input_stream.cc
@@ -25,6 +25,8 @@ FakeAudioInputStream::FakeAudioInputStream(AudioParameters params,
   AddRef();
 }
 
+FakeAudioInputStream::~FakeAudioInputStream() {}
+
 bool FakeAudioInputStream::Open() {
   buffer_.reset(new uint8[buffer_size_]);
   memset(buffer_.get(), 0, buffer_size_);
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 036503d..d1e3260 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -33,7 +33,7 @@ class FakeAudioInputStream :
   friend class base::RefCountedThreadSafe<FakeAudioInputStream>;
 
   FakeAudioInputStream(AudioParameters params, int samples_per_packet);
-  virtual ~FakeAudioInputStream() {}
+  virtual ~FakeAudioInputStream();
 
   void DoCallback();
 
diff --git a/media/audio/linux/alsa_input.cc b/media/audio/linux/alsa_input.cc
index d2be907..800be6f 100644
--- a/media/audio/linux/alsa_input.cc
+++ b/media/audio/linux/alsa_input.cc
@@ -44,6 +44,8 @@ AlsaPcmInputStream::AlsaPcmInputStream(const std::string& device_name,
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {
 }
 
+AlsaPcmInputStream::~AlsaPcmInputStream() {}
+
 bool AlsaPcmInputStream::Open() {
   if (device_handle_)
     return false;  // Already open.
diff --git a/media/audio/linux/alsa_input.h b/media/audio/linux/alsa_input.h
index 9a326e4..d0ed07d 100644
--- a/media/audio/linux/alsa_input.h
+++ b/media/audio/linux/alsa_input.h
@@ -32,6 +32,7 @@ class AlsaPcmInputStream : public AudioInputStream {
                      const AudioParameters& params,
                      int samples_per_packet,
                      AlsaWrapper* wrapper);
+  virtual ~AlsaPcmInputStream();
 
   // Implementation of AudioOutputStream.
   virtual bool Open();
diff --git a/media/filters/omx_video_decoder.cc b/media/filters/omx_video_decoder.cc
index eaa6169..ba122e5 100644
--- a/media/filters/omx_video_decoder.cc
+++ b/media/filters/omx_video_decoder.cc
@@ -5,6 +5,7 @@
 #include "media/filters/omx_video_decoder.h"
 
 #include "base/callback.h"
+#include "base/message_loop.h"
 #include "media/base/callback.h"
 #include "media/base/factory.h"
 #include "media/base/filter_host.h"
diff --git a/media/media.gyp b/media/media.gyp
index 0afbd79..111962a 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -144,6 +144,7 @@
         'video/ffmpeg_video_allocator.h',
         'video/ffmpeg_video_decode_engine.cc',
         'video/ffmpeg_video_decode_engine.h',
+        'video/video_decode_engine.cc',
         'video/video_decode_engine.h',
       ],
       'direct_dependent_settings': {
diff --git a/media/video/ffmpeg_video_allocator.cc b/media/video/ffmpeg_video_allocator.cc
index e9530b35..0185629 100644
--- a/media/video/ffmpeg_video_allocator.cc
+++ b/media/video/ffmpeg_video_allocator.cc
@@ -21,6 +21,8 @@ FFmpegVideoAllocator::FFmpegVideoAllocator()
       release_buffer_(NULL) {
 }
 
+FFmpegVideoAllocator::~FFmpegVideoAllocator() {}
+
 void FFmpegVideoAllocator::Initialize(AVCodecContext* codec_context,
                                       VideoFrame::Format surface_format) {
 #ifdef FF_THREAD_FRAME  // Only defined in FFMPEG-MT.
diff --git a/media/video/ffmpeg_video_allocator.h b/media/video/ffmpeg_video_allocator.h
index 92b84d6..c1e371a 100644
--- a/media/video/ffmpeg_video_allocator.h
+++ b/media/video/ffmpeg_video_allocator.h
@@ -24,7 +24,7 @@ namespace media {
 class FFmpegVideoAllocator {
  public:
   FFmpegVideoAllocator();
-  virtual ~FFmpegVideoAllocator() {}
+  virtual ~FFmpegVideoAllocator();
 
   struct RefCountedAVFrame {
     RefCountedAVFrame() : usage_count_(0) {}
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc
index 9f737ba..2902a10 100644
--- a/media/video/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/video/ffmpeg_video_decode_engine_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_ffmpeg.h"
diff --git a/media/video/mft_h264_decode_engine.h b/media/video/mft_h264_decode_engine.h
index e13dce9..a131c2f 100644
--- a/media/video/mft_h264_decode_engine.h
+++ b/media/video/mft_h264_decode_engine.h
@@ -14,6 +14,7 @@
 //   (SendFlushMessage, SendDrainMessage, etc.) to avoid having
 //   MFT_MESSAGE_TYPE in here
 #include <mfidl.h>
+#include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_comptr_win.h"
diff --git a/media/video/video_decode_engine.cc b/media/video/video_decode_engine.cc
new file mode 100644
index 0000000..04f3bea
--- /dev/null
+++ b/media/video/video_decode_engine.cc
@@ -0,0 +1,18 @@
+// 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 "media/video/video_decode_engine.h"
+
+namespace media {
+
+VideoCodecConfig::VideoCodecConfig()
+    : codec(kCodecH264),
+      profile(kProfileDoNotCare),
+      level(kLevelDoNotCare),
+      width(0),
+      height(0),
+      opaque_context(NULL) {
+}
+
+}  // namespace media
diff --git a/media/video/video_decode_engine.h b/media/video/video_decode_engine.h
index 0cd96b3..4182215 100644
--- a/media/video/video_decode_engine.h
+++ b/media/video/video_decode_engine.h
@@ -6,9 +6,10 @@
 #define MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_
 
 #include "base/callback.h"
-#include "base/message_loop.h"
 #include "media/base/video_frame.h"
 
+class MessageLoop;
+
 namespace media {
 
 class Buffer;
@@ -27,12 +28,7 @@ static const uint32 kProfileDoNotCare = static_cast<uint32>(-1);
 static const uint32 kLevelDoNotCare = static_cast<uint32>(-1);
 
 struct VideoCodecConfig {
-  VideoCodecConfig() : codec(kCodecH264),
-                       profile(kProfileDoNotCare),
-                       level(kLevelDoNotCare),
-                       width(0),
-                       height(0),
-                       opaque_context(NULL) {}
+  VideoCodecConfig();
 
   VideoCodec codec;