Revert of Decouple Media Service

content/common/gpu/gpu_command_buffer_stub.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 164 matching lines @@
                                  IPC::Message* reply_message);
   void OnAsyncFlush(int32_t put_offset,
                     uint32_t flush_count,
                     const std::vector<ui::LatencyInfo>& latency_info);
   void OnRegisterTransferBuffer(int32_t id,
                                 base::SharedMemoryHandle transfer_buffer,
                                 uint32_t size);
   void OnDestroyTransferBuffer(int32_t id);
   void OnGetTransferBuffer(int32_t id, IPC::Message* reply_message);
 
+  void OnCreateVideoDecoder(const media::VideoDecodeAccelerator::Config& config,
+                            int32_t route_id,
+                            IPC::Message* reply_message);
+  void OnCreateVideoEncoder(media::VideoPixelFormat input_format,
+                            const gfx::Size& input_visible_size,
+                            media::VideoCodecProfile output_profile,
+                            uint32_t initial_bitrate,
+                            int32_t route_id,
+                            IPC::Message* reply_message);
+
   void OnEnsureBackbuffer();
 
   void OnSignalSyncToken(const gpu::SyncToken& sync_token, uint32_t id);
   void OnSignalAck(uint32_t id);
   void OnSignalQuery(uint32_t query, uint32_t id);
 
   void OnFenceSyncRelease(uint64_t release);
   bool OnWaitFenceSync(gpu::CommandBufferNamespace namespace_id,
                        gpu::CommandBufferId command_buffer_id,
                        uint64_t release);
@@ skipping 28 matching lines @@
 
   bool CheckContextLost();
   void CheckCompleteWaits();
   void PullTextureUpdates(gpu::CommandBufferNamespace namespace_id,
                           gpu::CommandBufferId command_buffer_id,
                           uint32_t release);
 
   // The lifetime of objects of this class is managed by a GpuChannel. The
   // GpuChannels destroy all the GpuCommandBufferStubs that they own when they
   // are destroyed. So a raw pointer is safe.
-  GpuChannel* const channel_;
+  GpuChannel* channel_;
 
   // Outlives the stub.
-  gpu::SyncPointManager* const sync_point_manager_;
+  gpu::SyncPointManager* sync_point_manager_;
 
   // Task runner for main thread.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // The group of contexts that share namespaces with this context.
   scoped_refptr<gpu::gles2::ContextGroup> context_group_;
 
   bool initialized_;
   gfx::GLSurfaceHandle handle_;
   gfx::Size initial_size_;
@@ skipping 33 matching lines @@
 
   scoped_ptr<WaitForCommandState> wait_for_token_;
   scoped_ptr<WaitForCommandState> wait_for_get_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_