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();
+  if (status.status() == net::URLRequestStatus::IO_PENDING)

[darin (slow to review), 2012/08/30 16:15:18]

It should not be possible for status.status() to be IO_PENDING at this point.

[mkosiba (inactive), 2012/08/31 14:45:10]

Done.

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

[darin (slow to review), 2012/08/30 16:15:18]

I think you should take error_code from status.error().  You can assert that if
status.status() == CANCELED that the resulting error_code is ERR_ABORTED.

You definitely don't want to map all error codes to ERR_FAILED.

[mkosiba (inactive), 2012/08/31 14:45:10]

This only fixes up cases where code uses URLRequestStatus(CANCELED, 0) or
URLRequestStatus(FAILED, 0). I tried to fix up the callers but there's quite a
few of them (test code mostly), so I thought it might make more sense to fix 'em
up when we get around to removing URLRequestStatus completely.

+
+  ResourceRequestInfoImpl* info =
+      ResourceRequestInfoImpl::ForRequest(request_);
+  // If this check fails, then we're in an inconsistent state because all

[mkosiba (inactive), 2012/08/30 15:29:43]

not sure if this is the best place to put the check...

+  // requests ignored by the handler should be canceled (which should result in
+  // the ERR_ABORTED error code.
+  DCHECK(!info || !info->WasIgnoredByHandler() ||

[darin (slow to review), 2012/08/30 16:15:18]

I recommend saving WasIgnoredByHandler to a variable since you use it again
below.

I think you can also assume that info is non-null since it must be at this
point.

I would just write the DCHECK like this:

  // Ignored requests should also be canceled requests.
  DCHECK(!was_ignored_by_handler || error_code == net::ERR_ABORTED);

[mkosiba (inactive), 2012/08/31 14:45:10]

Done.

+         error_code == net::ERR_ABORTED);
+
   filter_->Send(new ResourceMsg_RequestComplete(routing_id_,
                                                 request_id,
-                                                status,
+                                                error_code,
+                                                info->WasIgnoredByHandler(),
                                                 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