Rename ServiceProvider to InterfaceProvider.

media/mojo/services/android_mojo_media_client.cc

Index: media/mojo/services/android_mojo_media_client.cc
diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc
index dd9a745502d3e25b272a3aff47d4c9b7fc39de1c..8c816f787a0d90e622b64a5fd86edf16d14d7384 100644
--- a/media/mojo/services/android_mojo_media_client.cc
+++ b/media/mojo/services/android_mojo_media_client.cc
@@ -17,7 +17,7 @@ namespace media {
 
 namespace {
 scoped_ptr<ProvisionFetcher> CreateProvisionFetcher(
-    mojo::ServiceProvider* service_provider) {
+    mojo::InterfaceProvider* service_provider) {
   interfaces::ProvisionFetcherPtr provision_fetcher_ptr;
   mojo::ConnectToService(service_provider, &provision_fetcher_ptr);
   return make_scoped_ptr(
@@ -30,7 +30,7 @@ class AndroidMojoMediaClient : public MojoMediaClient {
 
   // MojoMediaClient overrides.
   scoped_ptr<CdmFactory> CreateCdmFactory(
-      mojo::ServiceProvider* service_provider) override {
+      mojo::InterfaceProvider* service_provider) override {
     return make_scoped_ptr(new AndroidCdmFactory(
         base::Bind(&CreateProvisionFetcher, service_provider)));
   }