Revert 227318 "Clean up ResourceHandler API."

trunk/src/content/browser/loader/certificate_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/loader/certificate_resource_handler.h"
 
 #include "base/strings/string_util.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 
 namespace content {
 
 CertificateResourceHandler::CertificateResourceHandler(
     net::URLRequest* request)
-    : ResourceHandler(request),
+    : request_(request),
       content_length_(0),
       read_buffer_(NULL),
       resource_buffer_(NULL),
       cert_type_(net::CERTIFICATE_MIME_TYPE_UNKNOWN) {
 }
 
 CertificateResourceHandler::~CertificateResourceHandler() {
 }
 
 bool CertificateResourceHandler::OnUploadProgress(int request_id,
@@ skipping 17 matching lines @@
   return cert_type_ != net::CERTIFICATE_MIME_TYPE_UNKNOWN;
 }
 
 bool CertificateResourceHandler::OnWillStart(int request_id,
                                             const GURL& url,
                                             bool* defer) {
   return true;
 }
 
 bool CertificateResourceHandler::OnWillRead(int request_id,
-                                           scoped_refptr<net::IOBuffer>* buf,
+                                           net::IOBuffer** buf,
                                            int* buf_size,
                                            int min_size) {
   static const int kReadBufSize = 32768;
 
   // TODO(gauravsh): Should we use 'min_size' here?
   DCHECK(buf && buf_size);
   if (!read_buffer_.get()) {
     read_buffer_ = new net::IOBuffer(kReadBufSize);
   }
   *buf = read_buffer_.get();
@@ skipping 30 matching lines @@
     return false;
 
   AssembleResource();
 
   const void* content_bytes = NULL;
   if (resource_buffer_.get())
     content_bytes = resource_buffer_->data();
 
   // Note that it's up to the browser to verify that the certificate
   // data is well-formed.
-  const ResourceRequestInfo* info = GetRequestInfo();
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   GetContentClient()->browser()->AddCertificate(
-      request(), cert_type_, content_bytes, content_length_,
+      request_, cert_type_, content_bytes, content_length_,
       info->GetChildID(), info->GetRouteID());
 
   return true;
 }
 
 void CertificateResourceHandler::AssembleResource() {
   // 0-length IOBuffers are not allowed.
   if (content_length_ == 0) {
     resource_buffer_ = NULL;
     return;
@@ skipping 15 matching lines @@
   DCHECK_EQ(content_length_, bytes_copied);
 }
 
 void CertificateResourceHandler::OnDataDownloaded(
     int request_id,
     int bytes_downloaded) {
   NOTREACHED();
 }
 
 }  // namespace content