Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/webcookiejar_impl.cc

Index: mojo/services/html_viewer/webcookiejar_impl.cc
diff --git a/mojo/services/html_viewer/webcookiejar_impl.cc b/mojo/services/html_viewer/webcookiejar_impl.cc
index 0d864801edaabb2b472ebfd1e24fa25b393238b3..0b4b01231ece7234aa0c38cdb5c7ef26e3d823b8 100644
--- a/mojo/services/html_viewer/webcookiejar_impl.cc
+++ b/mojo/services/html_viewer/webcookiejar_impl.cc
@@ -7,7 +7,9 @@
 #include "base/bind.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
-namespace mojo {
+using mojo::String;
+
+namespace html_viewer {
 namespace {
 
 void CopyBool(bool* output, bool input) {
@@ -20,7 +22,7 @@ void CopyString(String* output, const String& input) {
 
 }  // namespace
 
-WebCookieJarImpl::WebCookieJarImpl(CookieStorePtr store)
+WebCookieJarImpl::WebCookieJarImpl(mojo::CookieStorePtr store)
     : store_(store.Pass()) {
 }
 
@@ -66,4 +68,4 @@ blink::WebString WebCookieJarImpl::cookieRequestHeaderFieldValue(
   return cookies(url, first_party_for_cookies);
 }
 
-}  // namespace mojo
+}  // namespace html_viewer