Revert of Decouple Media Service

content/common/gpu/gpu_command_buffer_stub.h

Index: content/common/gpu/gpu_command_buffer_stub.h
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index e20388717304d1dbd9fa84780a07431e22a5661a..0a3fdbae26a7bc577c08a3498e6d3d29995a4093 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -182,6 +182,16 @@
   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);
@@ -230,10 +240,10 @@
   // 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_;