Remove the HANDLED_EXTERNALLY status code.

content/browser/renderer_host/resource_dispatcher_host_unittest.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/resource_dispatcher_host_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 770 matching lines @@
 
   CheckSuccessfulRequest(msgs[0], net::URLRequestTestJob::test_data_1());
   CheckSuccessfulRequest(msgs[2], net::URLRequestTestJob::test_data_3());
 
   // Check that request 2 got canceled.
   ASSERT_EQ(2U, msgs[1].size());
   ASSERT_EQ(ResourceMsg_ReceivedResponse::ID, msgs[1][0].type());
   ASSERT_EQ(ResourceMsg_RequestComplete::ID, msgs[1][1].type());
 
   int request_id;
-  net::URLRequestStatus status;
+  int error_code;
 
   PickleIterator iter(msgs[1][1]);
   ASSERT_TRUE(IPC::ReadParam(&msgs[1][1], &iter, &request_id));
-  ASSERT_TRUE(IPC::ReadParam(&msgs[1][1], &iter, &status));
+  ASSERT_TRUE(IPC::ReadParam(&msgs[1][1], &iter, &error_code));
 
-  EXPECT_EQ(net::URLRequestStatus::CANCELED, status.status());
+  EXPECT_EQ(net::ERR_ABORTED, error_code);
 }
 
 TEST_F(ResourceDispatcherHostTest, CancelWhileStartIsDeferred) {
   EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(0));
 
   bool was_deleted = false;
 
   // Arrange to have requests deferred before starting.
   TestResourceDispatcherHostDelegate delegate;
   delegate.set_defer_flags(DEFER_STARTING_REQUEST);
@@ skipping 402 matching lines @@
     CheckSuccessfulRequest(msgs[i], net::URLRequestTestJob::test_data_2());
 
   // Check that the subsequent two requests (kMaxRequests + 1) and
   // (kMaxRequests + 2) were failed, since the per-process bound was reached.
   for (int i = 0; i < 2; ++i) {
     // Should have sent a single RequestComplete message.
     int index = kMaxRequests + i;
     EXPECT_EQ(1U, msgs[index].size());
     EXPECT_EQ(ResourceMsg_RequestComplete::ID, msgs[index][0].type());
 
-    // The RequestComplete message should have had status
-    // (CANCELLED, ERR_INSUFFICIENT_RESOURCES).
+    // The RequestComplete message should have the error code of
+    // ERR_INSUFFICIENT_RESOURCES.
     int request_id;
-    net::URLRequestStatus status;
+    int error_code;
 
     PickleIterator iter(msgs[index][0]);
     EXPECT_TRUE(IPC::ReadParam(&msgs[index][0], &iter, &request_id));
-    EXPECT_TRUE(IPC::ReadParam(&msgs[index][0], &iter, &status));
+    EXPECT_TRUE(IPC::ReadParam(&msgs[index][0], &iter, &error_code));
 
     EXPECT_EQ(index + 1, request_id);
-    EXPECT_EQ(net::URLRequestStatus::CANCELED, status.status());
-    EXPECT_EQ(net::ERR_INSUFFICIENT_RESOURCES, status.error());
+    EXPECT_EQ(net::ERR_INSUFFICIENT_RESOURCES, error_code);
   }
 
   // The final 2 requests should have succeeded.
   CheckSuccessfulRequest(msgs[kMaxRequests + 2],
                          net::URLRequestTestJob::test_data_2());
   CheckSuccessfulRequest(msgs[kMaxRequests + 3],
                          net::URLRequestTestJob::test_data_2());
 }
 
 // Tests that we sniff the mime type for a simple request.
@@ skipping 142 matching lines @@
   EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(0));
 
   // Sorts out all the messages we saw by request.
   ResourceIPCAccumulator::ClassifiedMessages msgs;
   accum_.GetClassifiedMessages(&msgs);
 
   // We should have gotten one RequestComplete message.
   ASSERT_EQ(1U, msgs[0].size());
   EXPECT_EQ(ResourceMsg_RequestComplete::ID, msgs[0][0].type());
 
-  // The RequestComplete message should have had status
-  // (CANCELED, ERR_FILE_NOT_FOUND).
+  // The RequestComplete message should have had the error code of
+  // ERR_FILE_NOT_FOUND.
   int request_id;
-  net::URLRequestStatus status;
+  int error_code;
 
   PickleIterator iter(msgs[0][0]);
   EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &request_id));
-  EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &status));
+  EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &error_code));
 
   EXPECT_EQ(1, request_id);
-  EXPECT_EQ(net::URLRequestStatus::CANCELED, status.status());
-  EXPECT_EQ(net::ERR_FILE_NOT_FOUND, status.error());
+  EXPECT_EQ(net::ERR_FILE_NOT_FOUND, error_code);
 }
 
 // Test for http://crbug.com/76202 .  We don't want to destroy a
 // download request prematurely when processing a cancellation from
 // the renderer.
 TEST_F(ResourceDispatcherHostTest, IgnoreCancelForDownloads) {
   EXPECT_EQ(0, host_.pending_requests());
 
   int render_view_id = 0;
   int request_id = 1;
@@ skipping 270 matching lines @@
   while (net::URLRequestTestJob::ProcessOnePendingMessage()) {}
 
   // Sort all the messages we saw by request.
   ResourceIPCAccumulator::ClassifiedMessages msgs;
   accum_.GetClassifiedMessages(&msgs);
 
   // We should have gotten one RequestComplete message.
   ASSERT_EQ(1U, msgs[0].size());
   EXPECT_EQ(ResourceMsg_RequestComplete::ID, msgs[0][0].type());
 
-  // The RequestComplete message should have had status
-  // (FAILED, ERR_UNKNOWN_URL_SCHEME).
+  // The RequestComplete message should have the error code of
+  // ERR_UNKNOWN_URL_SCHEME.
   int request_id;
-  net::URLRequestStatus status;
+  int error_code;
 
   PickleIterator iter(msgs[0][0]);
   EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &request_id));
-  EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &status));
+  EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &error_code));
 
   EXPECT_EQ(1, request_id);
-  EXPECT_EQ(net::URLRequestStatus::FAILED, status.status());
-  EXPECT_EQ(net::ERR_UNKNOWN_URL_SCHEME, status.error());
+  EXPECT_EQ(net::ERR_UNKNOWN_URL_SCHEME, error_code);
 }
 
 TEST_F(ResourceDispatcherHostTest, DataReceivedACKs) {
   EXPECT_EQ(0, host_.pending_requests());
 
   SendDataReceivedACKs(true);
 
   HandleScheme("big-job");
   MakeTestRequest(0, 1, GURL("big-job:0123456789,1000000"));
 
@@ skipping 47 matching lines @@
     }
 
     MessageLoop::current()->RunAllPending();
 
     msgs.clear();
     accum_.GetClassifiedMessages(&msgs);
   }
 }
 
 }  // namespace content