Revert of Decouple Media Service

content/content_common.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../cc/cc.gyp:cc',
     '../components/tracing.gyp:tracing',
     '../device/bluetooth/bluetooth.gyp:device_bluetooth',
@@ skipping 396 matching lines @@
       'common/gpu/gpu_surface_lookup.h',
       'common/gpu/gpu_watchdog.h',
       'common/gpu/image_transport_surface.cc',
       'common/gpu/image_transport_surface.h',
       'common/gpu/image_transport_surface_android.cc',
       'common/gpu/image_transport_surface_linux.cc',
       'common/gpu/image_transport_surface_mac.mm',
       'common/gpu/image_transport_surface_overlay_mac.h',
       'common/gpu/image_transport_surface_overlay_mac.mm',
       'common/gpu/image_transport_surface_win.cc',
-      'common/gpu/media/create_video_encoder_params.cc',
-      'common/gpu/media/create_video_encoder_params.h',
+      'common/gpu/media_messages.cc',
+      'common/gpu/media_messages.h',
       'common/gpu/media/fake_video_decode_accelerator.cc',
       'common/gpu/media/fake_video_decode_accelerator.h',
       'common/gpu/media/gpu_jpeg_decode_accelerator.cc',
       'common/gpu/media/gpu_jpeg_decode_accelerator.h',
       'common/gpu/media/gpu_video_accelerator_util.cc',
       'common/gpu/media/gpu_video_accelerator_util.h',
       'common/gpu/media/gpu_video_decode_accelerator.cc',
       'common/gpu/media/gpu_video_decode_accelerator.h',
       'common/gpu/media/gpu_video_encode_accelerator.cc',
       'common/gpu/media/gpu_video_encode_accelerator.h',
-      'common/gpu/media/media_channel.cc',
-      'common/gpu/media/media_channel.h',
-      'common/gpu/media/media_messages.cc',
-      'common/gpu/media/media_messages.h',
-      'common/gpu/media/media_service.cc',
-      'common/gpu/media/media_service.h',
       'common/gpu/stream_texture_android.cc',
       'common/gpu/stream_texture_android.h',
       'common/host_discardable_shared_memory_manager.cc',
       'common/host_discardable_shared_memory_manager.h',
       'common/host_shared_bitmap_manager.cc',
       'common/host_shared_bitmap_manager.h',
       'common/in_process_child_thread_params.cc',
       'common/in_process_child_thread_params.h',
       'common/indexed_db/indexed_db_constants.h',
       'common/indexed_db/indexed_db_key.cc',
@@ skipping 659 matching lines @@
         'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
       ],
     }],
   ],
 }