Revert of Decouple Media Service

content/gpu/gpu_child_thread.h

Index: content/gpu/gpu_child_thread.h
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index ec7d19edc993e7a7d1c98e9b94affa5c3c2860ad..b9aa2b2355a317184dcb95d5cca810483ad2e126 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -41,7 +41,6 @@
 class GpuMemoryBufferFactory;
 class GpuProcessControlImpl;
 class GpuWatchdogThread;
-class MediaService;
 
 // The main thread of the GPU child process. There will only ever be one of
 // these per process. It does process initialization and shutdown. It forwards
@@ -153,8 +152,6 @@
 
   scoped_ptr<GpuChannelManager> gpu_channel_manager_;
 
-  scoped_ptr<MediaService> media_service_;
-
   // Information about the GPU, such as device and vendor ID.
   gpu::GPUInfo gpu_info_;