Rename ServiceProvider to InterfaceProvider.

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index b8b55a3ed63dcd5a09115a4530d048abde521079..c1619258393f5d2bff761a473ed32f57ed685461 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -35,7 +35,7 @@
 #include "ipc/ipc_platform_file.h"
 #include "media/blink/webmediaplayer_delegate.h"
 #include "media/blink/webmediaplayer_params.h"
-#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/WebKit/public/platform/WebFocusType.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
@@ -635,8 +635,8 @@ class CONTENT_EXPORT RenderFrameImpl
 
   // Binds this render frame's service registry.
   void BindServiceRegistry(
-      mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services);
+      mojo::InterfaceRequest<mojo::InterfaceProvider> services,
+      mojo::InterfaceProviderPtr exposed_services);
 
   ManifestManager* manifest_manager();
 
@@ -965,7 +965,7 @@ class CONTENT_EXPORT RenderFrameImpl
 
   // Connects to a Mojo application and returns a proxy to its exposed
   // ServiceProvider.
-  mojo::ServiceProviderPtr ConnectToApplication(const GURL& url);
+  mojo::InterfaceProviderPtr ConnectToApplication(const GURL& url);
 
   // Returns the media delegate for WebMediaPlayer usage.  If
   // |media_player_delegate_| is NULL, one is created.