Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/webmediaplayer_factory.h

Index: mojo/services/html_viewer/webmediaplayer_factory.h
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.h b/mojo/services/html_viewer/webmediaplayer_factory.h
index a7050096d0f2279834ff4fc48d5dced0cb91e19c..964ffac8ffc7a36a316fb10ae1a85d14a266ac92 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.h
+++ b/mojo/services/html_viewer/webmediaplayer_factory.h
@@ -29,8 +29,10 @@ class AudioRendererSink;
 }
 
 namespace mojo {
-
 class Shell;
+}
+
+namespace html_viewer {
 
 // Helper class used to create blink::WebMediaPlayer objects.
 // This class stores the "global state" shared across all WebMediaPlayer
@@ -42,11 +44,10 @@ class WebMediaPlayerFactory {
       bool enable_mojo_media_renderer);
   ~WebMediaPlayerFactory();
 
-  blink::WebMediaPlayer* CreateMediaPlayer(
-      blink::WebLocalFrame* frame,
-      const blink::WebURL& url,
-      blink::WebMediaPlayerClient* client,
-      Shell* shell);
+  blink::WebMediaPlayer* CreateMediaPlayer(blink::WebLocalFrame* frame,
+                                           const blink::WebURL& url,
+                                           blink::WebMediaPlayerClient* client,
+                                           mojo::Shell* shell);
 
  private:
   const media::AudioHardwareConfig& GetAudioHardwareConfig();
@@ -63,6 +64,6 @@ class WebMediaPlayerFactory {
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerFactory);
 };
 
-}  // namespace mojo
+}  // namespace html_viewer
 
 #endif  // MOJO_SERVICES_HTML_VIEWER_WEBMEDIAPLAYER_FACTORY_H_