Delete media::Interfaces::ServiceFactory.

components/html_viewer/media_factory.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 "components/html_viewer/media_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 71 matching lines @@
     mojo::Shell* shell) {
 #if defined(OS_ANDROID)
   // TODO(xhwang): Get CreateMediaPlayer working on android.
   return nullptr;
 #else
   scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
   scoped_ptr<media::RendererFactory> media_renderer_factory;
 
   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,
                                           nullptr,  // No GPU factory.
                                           GetAudioHardwareConfig()));
   }
 
   media::WebMediaPlayerParams params(
       media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
       media_log, GetMediaThreadTaskRunner(), GetMediaThreadTaskRunner(),
@@ skipping 15 matching lines @@
 
 blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() {
   if (!web_encrypted_media_client_) {
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
         base::Bind(&AreSecureCodecsSupported), GetCdmFactory(),
         GetMediaPermission()));
   }
   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() {
   // TODO(xhwang): Replace DefaultMediaPermission with something real when
   // permissions are supported in html_viewer.
   NOTIMPLEMENTED();
 
   if (!media_permission_)
     media_permission_.reset(new media::DefaultMediaPermission(true));
   return media_permission_.get();
 }
 
 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());
   }
 
   return cdm_factory_.get();
 }
 
 #if !defined(OS_ANDROID)
 const media::AudioHardwareConfig& MediaFactory::GetAudioHardwareConfig() {
   return audio_hardware_config_;
 }
 
 scoped_refptr<media::RestartableAudioRendererSink>
 MediaFactory::CreateAudioRendererSink() {
   // TODO(dalecurtis): Replace this with an interface to an actual mojo service;
   // the AudioOutputStreamSink will not work in sandboxed processes.
   return new media::AudioOutputStreamSink();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 MediaFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.task_runner();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace html_viewer