Don't depend on /net for error codes in sky viewer.

sky/viewer/platform/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 "sky/viewer/platform/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/network/public/interfaces/network_service.mojom.h"
-#include "net/base/net_errors.h"
 #include "sky/engine/public/platform/WebURLError.h"
 #include "sky/engine/public/platform/WebURLLoadTiming.h"
 #include "sky/engine/public/platform/WebURLLoaderClient.h"
 #include "sky/engine/public/platform/WebURLResponse.h"
 #include "sky/viewer/converters/url_request_types.h"
 
 namespace sky {
 namespace {
 
+// This corresponds to ERR_ABORTED in net/base/net_error_list.h.
+// TODO(ppi): declare an enum in the network service mojom so that the clients
+// don't need to hard-code these values.
+const int32_t kNetErrorAborted = -3;
+
+const char kErrorDomain[] = "net";

[abarth-chromium, 2015/02/17 17:58:50]

Can we declare these values in a header that's shared by these two files?

[ppi, 2015/02/17 18:08:02]

Done.

+
 static 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;
@@ skipping 57 matching lines @@
                                 weak_factory_.GetWeakPtr()));
 }
 
 void WebURLLoaderImpl::cancel() {
   url_loader_.reset();
   response_body_stream_.reset();
 
   mojo::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;
+  failed_response->error->code = kNetErrorAborted;
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&WebURLLoaderImpl::OnReceivedResponse,
                  weak_factory_.GetWeakPtr(),
                  base::Passed(&failed_response)));
 }
 
 void WebURLLoaderImpl::OnReceivedResponse(mojo::URLResponsePtr url_response) {
   url_ = GURL(url_response->url);
@@ skipping 11 matching lines @@
       return;
 
     // Start streaming data
     response_body_stream_ = url_response->body.Pass();
     ReadMore();
   }
 }
 
 void WebURLLoaderImpl::OnReceivedError(mojo::URLResponsePtr url_response) {
   blink::WebURLError web_error;
-  web_error.domain = blink::WebString::fromUTF8(net::kErrorDomain);
+  web_error.domain = blink::WebString::fromUTF8(kErrorDomain);
   web_error.reason = url_response->error->code;
   web_error.unreachableURL = GURL(url_response->url);
   web_error.staleCopyInCache = false;
   web_error.isCancellation =
-      url_response->error->code == net::ERR_ABORTED ? true : false;
+      url_response->error->code == kNetErrorAborted ? true : false;
 
   client_->didFail(this, web_error);
 }
 
 void WebURLLoaderImpl::OnReceivedRedirect(mojo::URLResponsePtr url_response) {
   blink::WebURLRequest new_request;
   new_request.initialize();
   new_request.setURL(GURL(url_response->redirect_url));
   new_request.setHTTPMethod(
       blink::WebString::fromUTF8(url_response->redirect_method));
@@ skipping 38 matching lines @@
       MOJO_DEADLINE_INDEFINITE,
       base::Bind(&WebURLLoaderImpl::OnResponseBodyStreamReady,
                  weak_factory_.GetWeakPtr()));
 }
 
 void WebURLLoaderImpl::OnResponseBodyStreamReady(MojoResult result) {
   ReadMore();
 }
 
 }  // namespace sky