Delete GpuVideoService and move GpuVideoDecodeAccelerator ownership to stubs

content/common/gpu/media/gpu_video_decode_accelerator.h

Index: content/common/gpu/media/gpu_video_decode_accelerator.h
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
index 96954ffd1b2629f27c9f6473cba98ae7c89a8b9c..8fa944c62d7ace2aa7c9e97aaa2173b50fe1cf7b 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -20,14 +20,12 @@ class ReadWriteTokens;
 class GpuCommandBufferStub;
 
 class GpuVideoDecodeAccelerator
-    : public base::RefCountedThreadSafe<GpuVideoDecodeAccelerator>,
-      public IPC::Channel::Listener,
+    : public IPC::Channel::Listener,
       public IPC::Message::Sender,
       public media::VideoDecodeAccelerator::Client {
  public:
   GpuVideoDecodeAccelerator(IPC::Message::Sender* sender,
                             int32 host_route_id,
-                            int32 decoder_route_id,
                             GpuCommandBufferStub* stub);
   virtual ~GpuVideoDecodeAccelerator();
 
@@ -53,17 +51,12 @@ class GpuVideoDecodeAccelerator
   // Function to delegate sending to actual sender.
   virtual bool Send(IPC::Message* message);
 
-  void set_video_decode_accelerator(
-      media::VideoDecodeAccelerator* accelerator) {
-    DCHECK(!video_decode_accelerator_.get());
-    video_decode_accelerator_.reset(accelerator);
-  }
-
-  void AssignGLESBuffers(const std::vector<media::GLESBuffer>& buffers);
-
   // Callback to be fired when the underlying stub receives a new token.
   void OnSetToken(int32 token);
 
+  // Initialize the accelerator with the given configuration.
+  void Initialize(const std::vector<uint32>& configs);
+
  private:
   // Defers |msg| for later processing if it specifies a write token that hasn't
   // come to pass yet, and set |*deferred| to true.  Return false if the message
@@ -75,13 +68,10 @@ class GpuVideoDecodeAccelerator
       const gpu::ReadWriteTokens& /* tokens */,
       const std::vector<uint32>& config,
       std::vector<uint32>* configs);
-  void OnInitialize(
-      const gpu::ReadWriteTokens& /* tokens */,
-      const std::vector<uint32>& configs);
   void OnDecode(
       const gpu::ReadWriteTokens& /* tokens */,
       base::SharedMemoryHandle handle, int32 id, int32 size);
-  void OnAssignTextures(
+  void OnAssignGLESBuffers(
       const gpu::ReadWriteTokens& /* tokens */,
       const std::vector<int32>& buffer_ids,
       const std::vector<uint32>& texture_ids,
@@ -103,9 +93,6 @@ class GpuVideoDecodeAccelerator
   // Route ID to communicate with the host.
   int32 host_route_id_;
 
-  // Route ID of the decoder.
-  int32 decoder_route_id_;
-
   // Messages deferred for later processing when their tokens have come to pass.
   std::vector<IPC::Message*> deferred_messages_;