Rename ServiceProvider to InterfaceProvider.

media/mojo/services/default_mojo_media_client.cc

 // 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.
 
 #include "media/mojo/services/mojo_media_client.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_stream_sink.h"
@@ skipping 49 matching lines @@
     if (!video_renderer_sink_) {
       video_renderer_sink_ = make_scoped_ptr(
           new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60),
                             NullVideoSink::NewFrameCB(), task_runner));
     }
 
     return video_renderer_sink_.get();
   }
 
   scoped_ptr<CdmFactory> CreateCdmFactory(
-      mojo::ServiceProvider* /* service_provider */) override {
+      mojo::InterfaceProvider* /* service_provider */) override {
     return make_scoped_ptr(new DefaultCdmFactory());
   }
 
  private:
   FakeAudioLogFactory fake_audio_log_factory_;
   scoped_ptr<AudioHardwareConfig> audio_hardware_config_;
   scoped_refptr<AudioRendererSink> audio_renderer_sink_;
   scoped_ptr<VideoRendererSink> video_renderer_sink_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient);
 };
 
 }  // namespace (anonymous)
 
 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
   return make_scoped_ptr(new DefaultMojoMediaClient());
 }
 
 }  // namespace media