Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/content/content_renderer.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': [
     'content_common_mojo_bindings',
     '../gin/gin.gyp:gin',
     '../jingle/jingle.gyp:jingle_glue',
     '../media/media.gyp:media',
     '../mojo/mojo.gyp:mojo_environment_chromium',
     '../mojo/mojo.gyp:mojo_js_bindings_lib',
-    '../mojo/mojo.gyp:mojo_service_provider_bindings',
+    '../mojo/mojo.gyp:mojo_shell_bindings',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/WebKit/public/blink.gyp:blink',
     '../third_party/icu/icu.gyp:icui18n',
     '../third_party/icu/icu.gyp:icuuc',
     '../third_party/libjingle/libjingle.gyp:libjingle',
     '../third_party/npapi/npapi.gyp:npapi',
     '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
     '../ui/accessibility/accessibility.gyp:accessibility',
     '../ui/events/events.gyp:dom4_keycode_converter',
@@ skipping 668 matching lines @@
         'renderer/media/video_frame_deliverer.h',
         'renderer/media/video_source_handler.cc',
         'renderer/media/video_source_handler.h',
         'renderer/media/video_track_adapter.cc',
         'renderer/media/video_track_adapter.h',
         'renderer/media/webaudio_capturer_source.cc',
         'renderer/media/webaudio_capturer_source.h',
         'renderer/media/webrtc/webrtc_video_track_adapter.cc',
         'renderer/media/webrtc/webrtc_video_track_adapter.h',
         'renderer/media/webrtc/media_stream_remote_video_source.cc',
-        'renderer/media/webrtc/media_stream_remote_video_source.h',
+        'renderer/media/webrtc/media_stream_remote_video_source.h', 
         'renderer/media/webrtc/media_stream_track_metrics.cc',
         'renderer/media/webrtc/media_stream_track_metrics.h',
         'renderer/media/webrtc/peer_connection_dependency_factory.cc',
         'renderer/media/webrtc/peer_connection_dependency_factory.h',
         'renderer/media/webrtc/video_destination_handler.cc',
         'renderer/media/webrtc/video_destination_handler.h',
         'renderer/media/webrtc/webrtc_audio_sink_adapter.cc',
         'renderer/media/webrtc/webrtc_audio_sink_adapter.h',
         'renderer/media/webrtc/webrtc_local_audio_track_adapter.cc',
         'renderer/media/webrtc/webrtc_local_audio_track_adapter.h',
@@ skipping 78 matching lines @@
     }],
   ],
   'target_conditions': [
     ['OS=="android"', {
       'sources/': [
         ['include', '^renderer/render_view_linux\\.cc$'],
       ],
     }],
   ],
 }