Delete media::Interfaces::ServiceFactory.

components/html_viewer/media_factory.h

Index: components/html_viewer/media_factory.h
diff --git a/components/html_viewer/media_factory.h b/components/html_viewer/media_factory.h
index 804eddf01aa90c50cea94aaadd56a5d4f9318b96..8722df9a8477993a76d7778c30f3c020d1e0ba57 100644
--- a/components/html_viewer/media_factory.h
+++ b/components/html_viewer/media_factory.h
@@ -13,7 +13,6 @@
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/blink/url_index.h"
-#include "media/mojo/interfaces/service_factory.mojom.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 
 namespace base {
@@ -67,7 +66,7 @@ class MediaFactory {
   blink::WebEncryptedMediaClient* GetEncryptedMediaClient();
 
  private:
-  media::interfaces::ServiceFactory* GetMediaServiceFactory();
+  mojo::ServiceProvider* GetMediaServiceProvider();
   media::MediaPermission* GetMediaPermission();
   media::CdmFactory* GetCdmFactory();
 
@@ -87,7 +86,7 @@ class MediaFactory {
   mojo::Shell* shell_;
 
   // Lazily initialized objects.
-  media::interfaces::ServiceFactoryPtr media_service_factory_;
+  mojo::ServiceProviderPtr media_service_provider_;
   scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
   scoped_ptr<media::MediaPermission> media_permission_;
   scoped_ptr<media::CdmFactory> cdm_factory_;