Delete media::Interfaces::ServiceFactory.

components/html_viewer/media_factory.cc

Index: components/html_viewer/media_factory.cc
diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc
index cec7ae8799ee76e39b24f8ff12611f4034d55299..98890d523fe6e3ab63d55e86f0dfa47f026bb0d2 100644
--- a/components/html_viewer/media_factory.cc
+++ b/components/html_viewer/media_factory.cc
@@ -89,7 +89,7 @@ blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
 
   if (enable_mojo_media_renderer_) {
     media_renderer_factory.reset(
-        new media::MojoRendererFactory(GetMediaServiceFactory()));
+        new media::MojoRendererFactory(GetMediaServiceProvider()));
   } else {
     media_renderer_factory.reset(
         new media::DefaultRendererFactory(media_log,
@@ -125,18 +125,15 @@ blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() {
   return web_encrypted_media_client_.get();
 }
 
-media::interfaces::ServiceFactory* MediaFactory::GetMediaServiceFactory() {
-  if (!media_service_factory_) {
-    mojo::ServiceProviderPtr service_provider;
+mojo::ServiceProvider* MediaFactory::GetMediaServiceProvider() {
+  if (!media_service_provider_) {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:media");
-    shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
-                                 nullptr, nullptr,
-                                 base::Bind(&OnGotContentHandlerID));
-    mojo::ConnectToService(service_provider.get(), &media_service_factory_);
+    shell_->ConnectToApplication(std::move(request),
+                                 GetProxy(&media_service_provider_), nullptr,
+                                 nullptr, base::Bind(&OnGotContentHandlerID));
   }
-
-  return media_service_factory_.get();
+  return media_service_provider_.get();
 }
 
 media::MediaPermission* MediaFactory::GetMediaPermission() {
@@ -152,7 +149,7 @@ media::MediaPermission* MediaFactory::GetMediaPermission() {
 media::CdmFactory* MediaFactory::GetCdmFactory() {
   if (!cdm_factory_) {
     if (enable_mojo_media_renderer_)
-      cdm_factory_.reset(new media::MojoCdmFactory(GetMediaServiceFactory()));
+      cdm_factory_.reset(new media::MojoCdmFactory(GetMediaServiceProvider()));
     else
       cdm_factory_.reset(new media::DefaultCdmFactory());
   }