Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/weburlloader_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/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/html_viewer/blink_url_request_type_converters.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLLoadTiming.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 
-namespace mojo {
+using mojo::URLResponsePtr;
+
+namespace html_viewer {
 namespace {
 
-static blink::WebURLResponse::HTTPVersion StatusLineToHTTPVersion(
-    const String& status_line) {
+blink::WebURLResponse::HTTPVersion StatusLineToHTTPVersion(
+    const mojo::String& status_line) {
   if (status_line.is_null())
     return blink::WebURLResponse::HTTP_0_9;
 
   if (StartsWithASCII(status_line, "HTTP/1.0", true))
     return blink::WebURLResponse::HTTP_1_0;
 
   if (StartsWithASCII(status_line, "HTTP/1.1", true))
     return blink::WebURLResponse::HTTP_1_1;
 
   return blink::WebURLResponse::Unknown;
@@ skipping 33 matching lines @@
 }
 
 }  // namespace
 
 WebURLRequestExtraData::WebURLRequestExtraData() {
 }
 
 WebURLRequestExtraData::~WebURLRequestExtraData() {
 }
 
-WebURLLoaderImpl::WebURLLoaderImpl(NetworkService* network_service)
-    : client_(NULL),
-      weak_factory_(this) {
+WebURLLoaderImpl::WebURLLoaderImpl(mojo::NetworkService* network_service)
+    : client_(NULL), weak_factory_(this) {
   network_service->CreateURLLoader(GetProxy(&url_loader_));
 }
 
 WebURLLoaderImpl::~WebURLLoaderImpl() {
 }
 
 void WebURLLoaderImpl::loadSynchronously(
     const blink::WebURLRequest& request,
     blink::WebURLResponse& response,
     blink::WebURLError& error,
     blink::WebData& data) {
   NOTIMPLEMENTED();
 }
 
 void WebURLLoaderImpl::loadAsynchronously(const blink::WebURLRequest& request,
                                           blink::WebURLLoaderClient* client) {
   client_ = client;
   url_ = request.url();
 
-  URLRequestPtr url_request = URLRequest::From(request);
+  mojo::URLRequestPtr url_request = mojo::URLRequest::From(request);
   url_request->auto_follow_redirects = false;
 
   if (request.extraData()) {
     WebURLRequestExtraData* extra_data =
         static_cast<WebURLRequestExtraData*>(request.extraData());
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&WebURLLoaderImpl::OnReceivedResponse,
                    weak_factory_.GetWeakPtr(),
                    base::Passed(&extra_data->synthetic_response)));
   } else {
     url_loader_->Start(url_request.Pass(),
                        base::Bind(&WebURLLoaderImpl::OnReceivedResponse,
                                   weak_factory_.GetWeakPtr()));
   }
 }
 
 void WebURLLoaderImpl::cancel() {
   url_loader_.reset();
   response_body_stream_.reset();
 
-  URLResponsePtr failed_response(URLResponse::New());
-  failed_response->url = String::From(url_);
-  failed_response->error = NetworkError::New();
+  URLResponsePtr failed_response(mojo::URLResponse::New());
+  failed_response->url = mojo::String::From(url_);
+  failed_response->error = mojo::NetworkError::New();
   failed_response->error->code = net::ERR_ABORTED;
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&WebURLLoaderImpl::OnReceivedResponse,
                  weak_factory_.GetWeakPtr(),
                  base::Passed(&failed_response)));
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool defers_loading) {
@@ skipping 79 matching lines @@
       MOJO_HANDLE_SIGNAL_READABLE,
       MOJO_DEADLINE_INDEFINITE,
       base::Bind(&WebURLLoaderImpl::OnResponseBodyStreamReady,
                  weak_factory_.GetWeakPtr()));
 }
 
 void WebURLLoaderImpl::OnResponseBodyStreamReady(MojoResult result) {
   ReadMore();
 }
 
-}  // namespace mojo
+}  // namespace html_viewer