net: Rename URLRequestStatus::os_error_.

content/common/common_param_traits.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/common/common_param_traits.h"
 
 #include "content/common/content_constants.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
@@ skipping 123 matching lines @@
       type = "UNKNOWN";
       break;
   }
 
   LogParam(type, l);
 }
 
 void ParamTraits<net::URLRequestStatus>::Write(Message* m,
                                                const param_type& p) {
   WriteParam(m, static_cast<int>(p.status()));
-  WriteParam(m, p.os_error());
+  WriteParam(m, p.error());
 }
 
 bool ParamTraits<net::URLRequestStatus>::Read(const Message* m, void** iter,
                                               param_type* r) {
-  int status, os_error;
-  if (!ReadParam(m, iter, &status) ||
-      !ReadParam(m, iter, &os_error))
+  int status, error;
+  if (!ReadParam(m, iter, &status) || !ReadParam(m, iter, &error))
     return false;
   r->set_status(static_cast<net::URLRequestStatus::Status>(status));
-  r->set_os_error(os_error);
+  r->set_error(error);
   return true;
 }
 
 void ParamTraits<net::URLRequestStatus>::Log(const param_type& p,
                                              std::string* l) {
   std::string status;
   switch (p.status()) {
     case net::URLRequestStatus::SUCCESS:
       status = "SUCCESS";
       break;
@@ skipping 13 matching lines @@
       status = "UNKNOWN";
       break;
   }
   if (p.status() == net::URLRequestStatus::FAILED)
     l->append("(");
 
   LogParam(status, l);
 
   if (p.status() == net::URLRequestStatus::FAILED) {
     l->append(", ");
-    LogParam(p.os_error(), l);
+    LogParam(p.error(), l);
     l->append(")");
   }
 }
 
 // Only the net::UploadData ParamTraits<> definition needs this definition, so
 // keep this in the implementation file so we can forward declare UploadData in
 // the header.
 template <>
 struct ParamTraits<net::UploadData::Element> {
   typedef net::UploadData::Element param_type;
@@ skipping 360 matching lines @@
   const SkBitmap_Data* bmp_data =
       reinterpret_cast<const SkBitmap_Data*>(fixed_data);
   return bmp_data->InitSkBitmapFromData(r, variable_data, variable_data_size);
 }
 
 void ParamTraits<SkBitmap>::Log(const SkBitmap& p, std::string* l) {
   l->append("<SkBitmap>");
 }
 
 }  // namespace IPC