Move shell interfaces into the shell.mojom namespace.

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 38 matching lines @@
   // 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* shell)
+    mojo::shell::mojom::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* shell) {
+    mojo::shell::mojom::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 82 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