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

5 files changed, 22 insertions, 13 deletions

diff --git a/chrome/gpu/gpu_video_decoder.cc b/chrome/gpu/gpu_video_decoder.cc
index 6c90df5..b998149 100644
--- a/chrome/gpu/gpu_video_decoder.cc
+++ b/chrome/gpu/gpu_video_decoder.cc
@@ -20,6 +20,15 @@
 #include <d3d9.h>
 #endif
 
+struct GpuVideoDecoder::PendingAllocation {
+  size_t n;
+  size_t width;
+  size_t height;
+  media::VideoFrame::Format format;
+  std::vector<scoped_refptr<media::VideoFrame> >* frames;
+  Task* task;
+};
+
 void GpuVideoDecoder::OnChannelConnected(int32 peer_pid) {
 }
 
@@ -251,6 +260,8 @@ GpuVideoDecoder::GpuVideoDecoder(
 #endif
 }
 
+GpuVideoDecoder::~GpuVideoDecoder() {}
+
 void GpuVideoDecoder::OnInitialize(const GpuVideoDecoderInitParam& param) {
   // TODO(jiesun): codec id should come from |param|.
   config_.codec = media::kCodecH264;
diff --git a/chrome/gpu/gpu_video_decoder.h b/chrome/gpu/gpu_video_decoder.h
index 9a339e1..25885c8 100644
--- a/chrome/gpu/gpu_video_decoder.h
+++ b/chrome/gpu/gpu_video_decoder.h
@@ -97,7 +97,7 @@ class GpuVideoDecoder
                   IPC::Message::Sender* sender,
                   base::ProcessHandle handle,
                   gpu::gles2::GLES2Decoder* decoder);
-  virtual ~GpuVideoDecoder() {}
+  virtual ~GpuVideoDecoder();
 
   // IPC::Channel::Listener implementation.
   virtual void OnChannelConnected(int32 peer_pid);
@@ -130,14 +130,7 @@ class GpuVideoDecoder
   void SetGpuVideoDevice(GpuVideoDevice* device);
 
  private:
-  struct PendingAllocation {
-    size_t n;
-    size_t width;
-    size_t height;
-    media::VideoFrame::Format format;
-    std::vector<scoped_refptr<media::VideoFrame> >* frames;
-    Task* task;
-  };
+  struct PendingAllocation;
 
   int32 decoder_host_id() { return decoder_host_id_; }
 
diff --git a/chrome/gpu/gpu_video_decoder_unittest.cc b/chrome/gpu/gpu_video_decoder_unittest.cc
index 30f1664..b1ea751 100644
--- a/chrome/gpu/gpu_video_decoder_unittest.cc
+++ b/chrome/gpu/gpu_video_decoder_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/process.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_video_decoder.h"
diff --git a/chrome/gpu/gpu_video_service.cc b/chrome/gpu/gpu_video_service.cc
index 2ef32e8..03025b8 100644
--- a/chrome/gpu/gpu_video_service.cc
+++ b/chrome/gpu/gpu_video_service.cc
@@ -7,10 +7,17 @@
 #include "chrome/gpu/gpu_video_decoder.h"
 #include "chrome/gpu/gpu_video_service.h"
 
+struct GpuVideoService::GpuVideoDecoderInfo {
+  scoped_refptr<GpuVideoDecoder> decoder;
+  GpuChannel* channel;
+};
+
+
 GpuVideoService::GpuVideoService() {
   // TODO(jiesun): move this time consuming stuff out of here.
   IntializeGpuVideoService();
 }
+
 GpuVideoService::~GpuVideoService() {
   // TODO(jiesun): move this time consuming stuff out of here.
   UnintializeGpuVideoService();
diff --git a/chrome/gpu/gpu_video_service.h b/chrome/gpu/gpu_video_service.h
index a2c090e..e6af444 100644
--- a/chrome/gpu/gpu_video_service.h
+++ b/chrome/gpu/gpu_video_service.h
@@ -32,10 +32,7 @@ class GpuVideoService : public IPC::Channel::Listener,
                            int32 decoder_id);
 
  private:
-  struct GpuVideoDecoderInfo {
-    scoped_refptr<GpuVideoDecoder> decoder;
-    GpuChannel* channel;
-  };
+  struct GpuVideoDecoderInfo;
 
   GpuVideoService();
   virtual ~GpuVideoService();