1 files changed, 6 insertions, 10 deletions

diff --git a/chromium/content/common/gpu/media/gpu_video_decode_accelerator.h b/chromium/content/common/gpu/media/gpu_video_decode_accelerator.h
index c22608b854f..05d9fb0a1b9 100644
--- a/chromium/content/common/gpu/media/gpu_video_decode_accelerator.h
+++ b/chromium/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -13,7 +13,6 @@
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
-#include "content/common/gpu/media/video_decode_accelerator_impl.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
@@ -49,7 +48,6 @@ class GpuVideoDecodeAccelerator
                                      uint32 texture_target) OVERRIDE;
   virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE;
   virtual void PictureReady(const media::Picture& picture) OVERRIDE;
-  virtual void NotifyInitializeDone() OVERRIDE;
   virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE;
   virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) OVERRIDE;
   virtual void NotifyFlushDone() OVERRIDE;
@@ -63,8 +61,6 @@ class GpuVideoDecodeAccelerator
 
   // Initialize the accelerator with the given profile and send the
   // |init_done_msg| when done.
-  // The renderer process handle is valid as long as we have a channel between
-  // GPU process and the renderer.
   void Initialize(const media::VideoCodecProfile profile,
                   IPC::Message* init_done_msg);
 
@@ -89,19 +85,19 @@ class GpuVideoDecodeAccelerator
   // Sets the texture to cleared.
   void SetTextureCleared(const media::Picture& picture);
 
-  // Message to Send() when initialization is done.  Is only non-NULL during
-  // initialization and is owned by the IPC channel underlying the
-  // GpuCommandBufferStub.
-  IPC::Message* init_done_msg_;
+  // Helper for replying to the creation request.
+  void SendCreateDecoderReply(IPC::Message* message, bool succeeded);
 
   // Route ID to communicate with the host.
   int32 host_route_id_;
 
-  // Unowned pointer to the underlying GpuCommandBufferStub.
+  // Unowned pointer to the underlying GpuCommandBufferStub.  |this| is
+  // registered as a DestuctionObserver of |stub_| and will self-delete when
+  // |stub_| is destroyed.
   GpuCommandBufferStub* stub_;
 
   // The underlying VideoDecodeAccelerator.
-  scoped_ptr<VideoDecodeAcceleratorImpl> video_decode_accelerator_;
+  scoped_ptr<media::VideoDecodeAccelerator> video_decode_accelerator_;
 
   // Callback for making the relevant context current for GL calls.
   // Returns false if failed.