Remove the HANDLED_EXTERNALLY status code.

content/browser/renderer_host/async_resource_handler.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/async_resource_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/debug/alias.h"
@@ skipping 291 matching lines @@
 
   // TODO(gavinp): Remove this CHECK when we figure out the cause of
   // http://crbug.com/124680 . This check mirrors closely check in
   // WebURLLoaderImpl::OnCompletedRequest that routes this message to a WebCore
   // ResourceHandleInternal which asserts on its state and crashes. By crashing
   // when the message is sent, we should get better crash reports.
   CHECK(status.status() != net::URLRequestStatus::SUCCESS ||
         sent_received_response_msg_);
 
   TimeTicks completion_time = TimeTicks::Now();
+
+  int error_code = status.error();
+  bool was_ignored_by_handler =
+      ResourceRequestInfoImpl::ForRequest(request_)->WasIgnoredByHandler();
+
+  DCHECK(status.status() != net::URLRequestStatus::IO_PENDING);
+  // If this check fails, then we're in an inconsistent state because all
+  // requests ignored by the handler should be canceled (which should result in
+  // the ERR_ABORTED error code).
+  DCHECK(!was_ignored_by_handler || error_code == net::ERR_ABORTED);
+
+  // TODO(mkosiba): Fix up cases where we create a URLRequestStatus
+  // with a status() != SUCCESS and an error_code() == net::OK.
+  if (status.status() == net::URLRequestStatus::CANCELED &&
+           error_code == net::OK)

[darin (slow to review), 2012/08/31 16:15:51]

nit: indentation... realize you are probably aligning the '==', but that's not
conventional.  just left-align.

[mkosiba (inactive), 2012/09/06 18:30:22]

no idea how the indent ended up this way, certainly wasn't intentional.

+    error_code = net::ERR_ABORTED;
+  else if (status.status() == net::URLRequestStatus::FAILED &&
+           error_code == net::OK)
+    error_code = net::ERR_FAILED;

[mmenke, 2012/08/31 16:17:23]

Random nit:  Should also use brackets when the predicates in conditionals take
more than one line.

[darin (slow to review), 2012/08/31 16:55:51]

Agreed.  I had a similar thought, but didn't realize it was a style rule.

[mkosiba (inactive), 2012/09/06 18:30:22]

Done.

+
   filter_->Send(new ResourceMsg_RequestComplete(routing_id_,
                                                 request_id,
-                                                status,
+                                                error_code,
+                                                was_ignored_by_handler,
                                                 security_info,
                                                 completion_time));
 
   // If we still have a read buffer, then see about caching it for later...
   // Note that we have to make sure the buffer is not still being used, so we
   // have to perform an explicit check on the status code.
   if (g_spare_read_buffer ||
       net::URLRequestStatus::SUCCESS != status.status()) {
     read_buffer_ = NULL;
   } else if (read_buffer_.get()) {
@@ skipping 27 matching lines @@
 }
 
 void AsyncResourceHandler::ResumeIfDeferred() {
   if (did_defer_) {
     did_defer_ = false;
     controller()->Resume();
   }
 }
 
 }  // namespace content