Delete media::Interfaces::ServiceFactory.

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 907367be700b33d3e8309b3392fd1a56d2a0e95d..c042085809987bba4ea24bd537f124af6162d894 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -53,10 +53,6 @@
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #endif
 
-#if defined(ENABLE_MOJO_MEDIA)
-#include "media/mojo/interfaces/service_factory.mojom.h"
-#endif
-
 class GURL;
 class TransportDIB;
 struct FrameMsg_NewFrame_WidgetParams;
@@ -924,10 +920,7 @@ class CONTENT_EXPORT RenderFrameImpl
   media::MediaPermission* GetMediaPermission();
 
 #if defined(ENABLE_MOJO_MEDIA)
-  media::interfaces::ServiceFactory* GetMediaServiceFactory();
-
-  // Called when a connection error happened on |media_service_factory_|.
-  void OnMediaServiceFactoryConnectionError();
+  mojo::ServiceProvider* GetMediaServiceProvider();
 #endif
 
   media::CdmFactory* GetCdmFactory();
@@ -1065,7 +1058,7 @@ class CONTENT_EXPORT RenderFrameImpl
 
 #if defined(ENABLE_MOJO_MEDIA)
   // The media factory attached to this frame, lazily initialized.
-  media::interfaces::ServiceFactoryPtr media_service_factory_;
+  mojo::ServiceProviderPtr media_service_provider_;
 #endif
 
   // MidiClient attached to this frame; lazily initialized.