Rename ServiceProvider to InterfaceProvider.

mojo/mojo_base.gyp

 # Copyright 2014 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.
 
 # Essential components (and their tests) that are needed to build
 # Chrome should be here.  Other components that are useful only in
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
   'includes': [
     '../third_party/mojo/mojo_variables.gypi',
@@ skipping 188 matching lines @@
         '..',
       ],
     },
     {
       'target_name': 'mojo_application_bindings_mojom',
       'type': 'none',
       'variables': {
         'mojom_files': [
           'shell/public/interfaces/application_manager.mojom',
           'shell/public/interfaces/content_handler.mojom',
-          'shell/public/interfaces/service_provider.mojom',
+          'shell/public/interfaces/interface_provider.mojom',
           'shell/public/interfaces/shell.mojom',
           'shell/public/interfaces/shell_client.mojom',
         ],
       },
       'dependencies': [
         'mojo_services.gyp:network_service_bindings_generation',
       ],
       'export_dependent_settings': [
         'mojo_services.gyp:network_service_bindings_generation',
       ],
@@ skipping 145 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'mojo_common_unittests.isolate',
           ],
         },
       ],
     }],
   ]
 }