Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/webmediaplayer_factory.cc

Index: mojo/services/html_viewer/webmediaplayer_factory.cc
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index 084cd736c9b19aaa9e4c21c30efa9cbff632b316..356932e02caa17d4f48a75745144f5ae05b70519 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -23,7 +23,9 @@
 #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 {
@@ -35,7 +37,8 @@ class RendererServiceProvider
       : 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);
   }
 
@@ -74,7 +77,7 @@ 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
@@ -125,4 +128,4 @@ WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   return media_thread_.message_loop_proxy();
 }
 
-}  // namespace mojo
+}  // namespace html_viewer