Revert 279557 "Support exposing Mojo services between render fra..."

trunk/src/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',
     '../components/tracing.gyp:tracing',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../net/net.gyp:net',
@@ skipping 83 matching lines @@
       'public/common/resource_response_info.cc',
       'public/common/resource_response_info.h',
       'public/common/result_codes.h',
       'public/common/result_codes_list.h',
       'public/common/sandbox_init.h',
       'public/common/sandbox_linux.h',
       'public/common/sandbox_type_mac.h',
       'public/common/sandboxed_process_launcher_delegate.cc',
       'public/common/sandboxed_process_launcher_delegate.h',
       'public/common/security_style.h',
-      'public/common/service_registry.h',
       'public/common/show_desktop_notification_params.cc',
       'public/common/show_desktop_notification_params.h',
       'public/common/signed_certificate_timestamp_id_and_status.cc',
       'public/common/signed_certificate_timestamp_id_and_status.h',
       'public/common/speech_recognition_error.h',
       'public/common/speech_recognition_grammar.h',
       'public/common/speech_recognition_result.cc',
       'public/common/speech_recognition_result.h',
       'public/common/ssl_status.cc',
       'public/common/ssl_status.h',
@@ skipping 253 matching lines @@
       'common/media/midi_messages.h',
       'common/media/video_capture.h',
       'common/media/video_capture_messages.h',
       'common/media/webrtc_identity_messages.h',
       'common/memory_benchmark_messages.h',
       'common/message_port_messages.h',
       'common/message_router.cc',
       'common/message_router.h',
       'common/mime_registry_messages.h',
       'common/mojo/mojo_messages.h',
-      'common/mojo/service_registry_impl.cc',
-      'common/mojo/service_registry_impl.h',
+      'common/mojo/mojo_service_names.cc',
+      'common/mojo/mojo_service_names.h',
       'common/navigation_gesture.h',
       'common/net/url_fetcher.cc',
       'common/net/url_request_user_data.cc',
       'common/net/url_request_user_data.h',
       'common/one_writer_seqlock.cc',
       'common/one_writer_seqlock.h',
       'common/p2p_messages.h',
       'common/page_state_serialization.cc',
       'common/page_state_serialization.h',
       'common/page_zoom.cc',
@@ skipping 136 matching lines @@
         '../gpu/gpu.gyp:gles2_c_lib',
         '../gpu/gpu.gyp:gles2_implementation',
         # TODO: the dependency on gl_in_process_context should be decoupled from
         # content and moved to android_webview. See crbug.com/365797.
         '../gpu/gpu.gyp:gl_in_process_context',
         '../gpu/gpu.gyp:gpu_ipc',
         '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
-        '../mojo/mojo.gyp:mojo_cpp_bindings',
         '../mojo/mojo.gyp:mojo_environment_chromium',
         '../mojo/mojo.gyp:mojo_system_impl',
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
         '../webkit/common/webkit_common.gyp:webkit_common',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
       ],
       'actions': [
         {
           'action_name': 'generate_webkit_version',
@@ skipping 255 matching lines @@
     }, {
       'defines': ['USE_SECCOMP_BPF'],
     }],
     ['use_ozone==1', {
       'dependencies': [
         '../ui/ozone/ozone.gyp:ozone',
       ],
     }],
   ],
 }