Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

content/content_browser.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_static',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_surfaces',
     '../components/components.gyp:display_compositor',
@@ skipping 96 matching lines @@
       'public/browser/access_token_store.h',
       'public/browser/android/browser_media_player_manager_register.cc',
       'public/browser/android/browser_media_player_manager_register.h',
       'public/browser/android/compositor.h',
       'public/browser/android/compositor_client.h',
       'public/browser/android/content_protocol_handler.h',
       'public/browser/android/content_view_core.h',
       'public/browser/android/content_view_layer_renderer.h',
       'public/browser/android/devtools_auth.h',
       'public/browser/android/external_video_surface_container.h',
-      'public/browser/android/service_registry_android.h',
+      'public/browser/android/interface_provider_android.h',
+      'public/browser/android/interface_registry_android.h',
       'public/browser/android/synchronous_compositor.cc',
       'public/browser/android/synchronous_compositor.h',
       'public/browser/android/synchronous_compositor_client.h',
       'public/browser/appcache_service.h',
       'public/browser/ax_event_notification_details.cc',
       'public/browser/ax_event_notification_details.h',
       'public/browser/background_sync_controller.h',
       'public/browser/background_sync_parameters.cc',
       'public/browser/background_sync_parameters.h',
       'public/browser/background_tracing_config.cc',
@@ skipping 282 matching lines @@
       'browser/android/browser_surface_texture_manager.h',
       'browser/android/child_process_launcher_android.cc',
       'browser/android/child_process_launcher_android.h',
       'browser/android/content_protocol_handler_impl.cc',
       'browser/android/content_protocol_handler_impl.h',
       'browser/android/content_startup_flags.cc',
       'browser/android/content_startup_flags.h',
       'browser/android/content_video_view.cc',
       'browser/android/content_video_view.h',
       'browser/android/devtools_auth.cc',
-      'browser/android/service_registry_android_impl.cc',
-      'browser/android/service_registry_android_impl.h',
+      'browser/android/interface_provider_android_impl.cc',
+      'browser/android/interface_provider_android_impl.h',
+      'browser/android/interface_registry_android_impl.cc',
+      'browser/android/interface_registry_android_impl.h',
       'browser/android/url_request_content_job.cc',
       'browser/android/url_request_content_job.h',
       'browser/appcache/appcache.cc',
       'browser/appcache/appcache.h',
       'browser/appcache/appcache_backend_impl.cc',
       'browser/appcache/appcache_backend_impl.h',
       'browser/appcache/appcache_database.cc',
       'browser/appcache/appcache_database.h',
       'browser/appcache/appcache_disk_cache.cc',
       'browser/appcache/appcache_disk_cache.h',
@@ skipping 677 matching lines @@
       'browser/memory/memory_pressure_controller_impl.h',
       'browser/message_port_message_filter.cc',
       'browser/message_port_message_filter.h',
       'browser/message_port_provider.cc',
       'browser/message_port_service.cc',
       'browser/message_port_service.h',
       'browser/mime_registry_impl.cc',
       'browser/mime_registry_impl.h',
       'browser/mojo/constants.cc',
       'browser/mojo/constants.h',
+      'browser/mojo/interface_registrar_android.cc',
+      'browser/mojo/interface_registrar_android.h',
       'browser/mojo/mojo_child_connection.cc',
       'browser/mojo/mojo_child_connection.h',
       'browser/mojo/mojo_shell_context.cc',
       'browser/mojo/mojo_shell_context.h',
-      'browser/mojo/service_registrar_android.cc',
-      'browser/mojo/service_registrar_android.h',
       'browser/net/browser_online_state_observer.cc',
       'browser/net/browser_online_state_observer.h',
       'browser/net/network_errors_listing_ui.cc',
       'browser/net/network_errors_listing_ui.h',
       'browser/net/quota_policy_cookie_store.cc',
       'browser/net/quota_policy_cookie_store.h',
       'browser/net/view_blob_internals_job_factory.cc',
       'browser/net/view_blob_internals_job_factory.h',
       'browser/net/view_http_cache_job_factory.cc',
       'browser/net/view_http_cache_job_factory.h',
@@ skipping 1039 matching lines @@
       ],
     }],
     ['OS != "mac" and OS != "android"', {
       'sources!': [
         'browser/gpu/gpu_surface_tracker.cc',
         'browser/gpu/gpu_surface_tracker.h',
       ],
     }],
   ],
 }