Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/webmediaplayer_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 "mojo/services/html_viewer/webmediaplayer_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_stream_sink.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/filters/default_renderer_factory.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/mojo/interfaces/media_renderer.mojom.h"
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 
-namespace mojo {
+using mojo::ServiceProviderPtr;
+
+namespace html_viewer {
 
 #if !defined(OS_ANDROID)
 namespace {
 
 class RendererServiceProvider
     : public media::MojoRendererFactory::ServiceProvider {
  public:
   explicit RendererServiceProvider(ServiceProviderPtr service_provider_ptr)
       : service_provider_ptr_(service_provider_ptr.Pass()) {}
   ~RendererServiceProvider() final {}
 
-  void ConnectToService(InterfacePtr<MediaRenderer>* media_renderer_ptr) final {
+  void ConnectToService(
+      mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) final {
     mojo::ConnectToService(service_provider_ptr_.get(), media_renderer_ptr);
   }
 
  private:
   ServiceProviderPtr service_provider_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererServiceProvider);
 };
 
 }  // namespace
@@ skipping 18 matching lines @@
   }
 }
 
 WebMediaPlayerFactory::~WebMediaPlayerFactory() {
 }
 
 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
-    Shell* shell) {
+    mojo::Shell* shell) {
 #if defined(OS_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_) {
     ServiceProviderPtr media_renderer_service_provider;
     shell->ConnectToApplication("mojo:media",
                                 GetProxy(&media_renderer_service_provider));
@@ skipping 30 matching lines @@
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 
-}  // namespace mojo
+}  // namespace html_viewer