Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

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 <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/cdm/default_cdm_factory.h"
 #include "media/filters/default_media_permission.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "media/mojo/services/mojo_cdm_factory.h"
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
-#include "mojo/shell/public/cpp/connect.h"
-#include "mojo/shell/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "v8/include/v8.h"
 
 namespace html_viewer {
 
 namespace {
 
 // Enable mojo media Renderer in media pipeline instead of using the internal
 // media::Renderer implementation.
 // TODO(xhwang): Move this to media_switches.h.
 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
 
 bool AreSecureCodecsSupported() {
   // Hardware-secure codecs are not currently supported by HTML Viewer on any
   // platform.
   return false;
 }
 
-void OnGotRemoteIDs(uint32_t remote_id, uint32_t content_handler_id) {}
-
 }  // namespace
 
 MediaFactory::MediaFactory(
     const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
-    mojo::shell::mojom::Shell* shell)
+    mojo::Shell* shell)
     :
 #if !defined(OS_ANDROID)
       media_thread_("Media"),
       audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)),
       audio_hardware_config_(
           audio_manager_->GetInputStreamParameters(
               media::AudioManagerBase::kDefaultDeviceId),
           audio_manager_->GetDefaultOutputStreamParameters()),
 #endif
       enable_mojo_media_renderer_(base::CommandLine::ForCurrentProcess()
                                       ->HasSwitch(kEnableMojoMediaRenderer)),
       compositor_task_runner_(compositor_task_runner),
       shell_(shell) {
   media::InitializeMediaLibrary();
 }
 
 MediaFactory::~MediaFactory() {
 }
 
 blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
     blink::WebContentDecryptionModule* initial_cdm,
-    mojo::shell::mojom::Shell* shell) {
+    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()));
@@ skipping 26 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::URLRequestPtr request(mojo::URLRequest::New());
-    request->url = mojo::String::From("mojo:media");
-    shell_->ConnectToApplication(std::move(request),
-                                 GetProxy(&service_provider), nullptr, nullptr,
-                                 base::Bind(&OnGotRemoteIDs));
-    mojo::ConnectToService(service_provider.get(), &media_service_factory_);
-  }
-
+  if (!media_service_factory_)
+    shell_->ConnectToService("mojo:media", &media_service_factory_);
   return media_service_factory_.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));
@@ skipping 26 matching lines @@
 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