net: Rename URLRequestStatus::os_error_.

content/browser/renderer_host/resource_dispatcher_host_unittest.cc

 // Copyright (c) 2011 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.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 950 matching lines @@
     // (CANCELLED, ERR_INSUFFICIENT_RESOURCES).
     int request_id;
     net::URLRequestStatus status;
 
     void* iter = NULL;
     EXPECT_TRUE(IPC::ReadParam(&msgs[index][0], &iter, &request_id));
     EXPECT_TRUE(IPC::ReadParam(&msgs[index][0], &iter, &status));
 
     EXPECT_EQ(index + 1, request_id);
     EXPECT_EQ(net::URLRequestStatus::CANCELED, status.status());
-    EXPECT_EQ(net::ERR_INSUFFICIENT_RESOURCES, status.os_error());
+    EXPECT_EQ(net::ERR_INSUFFICIENT_RESOURCES, status.error());
   }
 
   // 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 143 matching lines @@
   // (CANCELED, ERR_FILE_NOT_FOUND).
   int request_id;
   net::URLRequestStatus status;
 
   void* iter = NULL;
   EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &request_id));
   EXPECT_TRUE(IPC::ReadParam(&msgs[0][0], &iter, &status));
 
   EXPECT_EQ(1, request_id);
   EXPECT_EQ(net::URLRequestStatus::CANCELED, status.status());
-  EXPECT_EQ(net::ERR_FILE_NOT_FOUND, status.os_error());
+  EXPECT_EQ(net::ERR_FILE_NOT_FOUND, status.error());
 }
 
 namespace {
 DownloadId MockNextDownloadId() {
   return DownloadId(reinterpret_cast<DownloadManager*>(0xFFFFFFFF), 0);
 }
 }
 
 // Test for http://crbug.com/76202 .  We don't want to destroy a
 // download request prematurely when processing a cancellation from
@@ skipping 69 matching lines @@
   EXPECT_EQ(1, host_.pending_requests());
 
   // Cancelling by other methods shouldn't work either.
   host_.CancelRequestsForProcess(render_view_id);
   EXPECT_EQ(1, host_.pending_requests());
 
   // Cancelling by context should work.
   host_.CancelRequestsForContext(&filter_->resource_context());
   EXPECT_EQ(0, host_.pending_requests());
 }