Move shell service to toplevel shell namespace

media/mojo/services/service_factory_impl.h

 // Copyright 2015 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.
 
 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 15 matching lines @@
 namespace media {
 
 class CdmFactory;
 class MediaLog;
 class MojoMediaClient;
 class RendererFactory;
 
 class ServiceFactoryImpl : public interfaces::ServiceFactory {
  public:
   ServiceFactoryImpl(mojo::InterfaceRequest<interfaces::ServiceFactory> request,
-                     mojo::shell::mojom::InterfaceProvider* interfaces,
+                     shell::mojom::InterfaceProvider* interfaces,
                      scoped_refptr<MediaLog> media_log,
-                     std::unique_ptr<mojo::MessageLoopRef> parent_app_refcount,
+                     std::unique_ptr<shell::MessageLoopRef> parent_app_refcount,
                      MojoMediaClient* mojo_media_client);
   ~ServiceFactoryImpl() final;
 
   // interfaces::ServiceFactory implementation.
   void CreateAudioDecoder(
       mojo::InterfaceRequest<interfaces::AudioDecoder> audio_decoder) final;
   void CreateRenderer(
       mojo::InterfaceRequest<interfaces::Renderer> renderer) final;
   void CreateCdm(
       mojo::InterfaceRequest<interfaces::ContentDecryptionModule> cdm) final;
 
  private:
 #if defined(ENABLE_MOJO_RENDERER)
   RendererFactory* GetRendererFactory();
 
   std::unique_ptr<RendererFactory> renderer_factory_;
 #endif  // defined(ENABLE_MOJO_RENDERER)
 
 #if defined(ENABLE_MOJO_CDM)
   CdmFactory* GetCdmFactory();
 
   std::unique_ptr<CdmFactory> cdm_factory_;
 #endif  // defined(ENABLE_MOJO_CDM)
 
   MojoCdmServiceContext cdm_service_context_;
   mojo::StrongBinding<interfaces::ServiceFactory> binding_;
-  mojo::shell::mojom::InterfaceProvider* interfaces_;
+  shell::mojom::InterfaceProvider* interfaces_;
   scoped_refptr<MediaLog> media_log_;
-  std::unique_ptr<mojo::MessageLoopRef> parent_app_refcount_;
+  std::unique_ptr<shell::MessageLoopRef> parent_app_refcount_;
   MojoMediaClient* mojo_media_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_