Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/webcookiejar_impl.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/webcookiejar_impl.h"
 
 #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) {
   *output = input;
 }
 
 void CopyString(String* output, const String& input) {
   *output = input;
 }
 
 }  // namespace
 
-WebCookieJarImpl::WebCookieJarImpl(CookieStorePtr store)
+WebCookieJarImpl::WebCookieJarImpl(mojo::CookieStorePtr store)
     : store_(store.Pass()) {
 }
 
 WebCookieJarImpl::~WebCookieJarImpl() {
 }
 
 void WebCookieJarImpl::setCookie(const blink::WebURL& url,
                                  const blink::WebURL& first_party_for_cookies,
                                  const blink::WebString& cookie) {
   bool success;
@@ skipping 25 matching lines @@
 
   return blink::WebString::fromUTF8(result);
 }
 
 blink::WebString WebCookieJarImpl::cookieRequestHeaderFieldValue(
     const blink::WebURL& url,
     const blink::WebURL& first_party_for_cookies) {
   return cookies(url, first_party_for_cookies);
 }
 
-}  // namespace mojo
+}  // namespace html_viewer