Rename ServiceProvider to InterfaceProvider.

media/mojo/services/mojo_media_client.h

 // 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.
 
 #ifndef MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_
 #define MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_
 
 #include "base/single_thread_task_runner.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/cdm_factory.h"
@@ skipping 21 matching lines @@
   virtual scoped_ptr<RendererFactory> CreateRendererFactory(
       const scoped_refptr<MediaLog>& media_log);
   // The output sink used for rendering audio or video respectively. These
   // sinks must be owned by the client.
   virtual AudioRendererSink* CreateAudioRendererSink();
   virtual VideoRendererSink* CreateVideoRendererSink(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 
   // Returns the CdmFactory to be used by MojoCdmService.
   virtual scoped_ptr<CdmFactory> CreateCdmFactory(
-      mojo::ServiceProvider* service_provider);
+      mojo::InterfaceProvider* service_provider);
 
  protected:
   MojoMediaClient();
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_