Rewrite guts of ResourceLoader and BufferedResourceHandler to suck less.

content/browser/renderer_host/x509_user_cert_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/x509_user_cert_resource_handler.h"
 
 #include "base/string_util.h"
 #include "content/browser/renderer_host/resource_request_info_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/resource_response.h"
@@ skipping 59 matching lines @@
   if (!read_buffer_) {
     read_buffer_ = new net::IOBuffer(kReadBufSize);
   }
   *buf = read_buffer_.get();
   *buf_size = kReadBufSize;
 
   return true;
 }
 
 bool X509UserCertResourceHandler::OnReadCompleted(int request_id,
-                                                  int* bytes_read,
+                                                  int bytes_read,
                                                   bool* defer) {
-  if (!*bytes_read)
+  if (!bytes_read)
     return true;
 
   // We have more data to read.
   DCHECK(read_buffer_);
-  content_length_ += *bytes_read;
+  content_length_ += bytes_read;
 
   // Release the ownership of the buffer, and store a reference
   // to it. A new one will be allocated in OnWillRead().
   net::IOBuffer* buffer = NULL;
   read_buffer_.swap(&buffer);
   // TODO(gauravsh): Should this be handled by a separate thread?
-  buffer_.push_back(std::make_pair(buffer, *bytes_read));
+  buffer_.push_back(std::make_pair(buffer, bytes_read));
 
   return true;
 }
 
 bool X509UserCertResourceHandler::OnResponseCompleted(
     int request_id,
     const net::URLRequestStatus& urs,
     const std::string& sec_info) {
   if (urs.status() != net::URLRequestStatus::SUCCESS)
     return false;
@@ skipping 26 matching lines @@
     size_t data_len = buffer_[i].second;
     DCHECK(data != NULL);
     DCHECK_LE(bytes_copied + data_len, content_length_);
     memcpy(resource_buffer_->data() + bytes_copied, data->data(), data_len);
     bytes_copied += data_len;
   }
   DCHECK_EQ(content_length_, bytes_copied);
 }
 
 }  // namespace content