Rename ServiceProvider to InterfaceProvider.

content/browser/frame_host/frame_mojo_shell.h

Index: content/browser/frame_host/frame_mojo_shell.h
diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h
index 1f1030f0f1e403364e4a8532e7901c14a2ecbc25..dbb657b1b62310d59dbda5a27fb3f3ac8dcc26b3 100644
--- a/content/browser/frame_host/frame_mojo_shell.h
+++ b/content/browser/frame_host/frame_mojo_shell.h
@@ -31,8 +31,8 @@ class FrameMojoShell : public mojo::shell::mojom::Shell {
   // mojo::Shell:
   void ConnectToApplication(
       mojo::URLRequestPtr application_url,
-      mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services,
+      mojo::InterfaceRequest<mojo::InterfaceProvider> services,
+      mojo::InterfaceProviderPtr exposed_services,
       mojo::shell::mojom::CapabilityFilterPtr filter,
       const ConnectToApplicationCallback& callback) override;
   void QuitApplication() override;
@@ -44,7 +44,7 @@ class FrameMojoShell : public mojo::shell::mojom::Shell {
 
   // ServiceRegistry providing browser services to connected applications.
   scoped_ptr<ServiceRegistryImpl> service_registry_;
-  mojo::WeakBindingSet<mojo::ServiceProvider> service_provider_bindings_;
+  mojo::WeakBindingSet<mojo::InterfaceProvider> service_provider_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
 };