Revert 227318 "Clean up ResourceHandler API."

content/browser/download/download_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/download/download_resource_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 56 matching lines @@
 
 }  // namespace
 
 const int DownloadResourceHandler::kDownloadByteStreamSize = 100 * 1024;
 
 DownloadResourceHandler::DownloadResourceHandler(
     uint32 id,
     net::URLRequest* request,
     const DownloadUrlParameters::OnStartedCallback& started_cb,
     scoped_ptr<DownloadSaveInfo> save_info)
-    : ResourceHandler(request),
-      download_id_(id),
+    : download_id_(id),
       content_length_(0),
+      request_(request),
       started_cb_(started_cb),
       save_info_(save_info.Pass()),
       last_buffer_size_(0),
       bytes_read_(0),
       pause_count_(0),
       was_deferred_(false),
       on_response_started_called_(false) {
   RecordDownloadCount(UNTHROTTLED_COUNT);
 }
 
 bool DownloadResourceHandler::OnUploadProgress(int request_id,
                                                uint64 position,
                                                uint64 size) {
   return true;
 }
 
 bool DownloadResourceHandler::OnRequestRedirected(
     int request_id,
     const GURL& url,
     ResourceResponse* response,
     bool* defer) {
   // We treat a download as a main frame load, and thus update the policy URL
   // on redirects.
-  request()->set_first_party_for_cookies(url);
+  request_->set_first_party_for_cookies(url);
   return true;
 }
 
 // Send the download creation information to the download thread.
 bool DownloadResourceHandler::OnResponseStarted(
     int request_id,
     ResourceResponse* response,
     bool* defer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // There can be only one (call)
   DCHECK(!on_response_started_called_);
   on_response_started_called_ = true;
 
   VLOG(20) << __FUNCTION__ << "()" << DebugString()
            << " request_id = " << request_id;
   download_start_time_ = base::TimeTicks::Now();
 
   // If it's a download, we don't want to poison the cache with it.
-  request()->StopCaching();
+  request_->StopCaching();
 
   // Lower priority as well, so downloads don't contend for resources
   // with main frames.
-  request()->SetPriority(net::IDLE);
+  request_->SetPriority(net::IDLE);
 
   std::string content_disposition;
-  request()->GetResponseHeaderByName("content-disposition",
-                                     &content_disposition);
+  request_->GetResponseHeaderByName("content-disposition",
+                                    &content_disposition);
   SetContentDisposition(content_disposition);
   SetContentLength(response->head.content_length);
 
-  const ResourceRequestInfoImpl* request_info = GetRequestInfo();
+  const ResourceRequestInfoImpl* request_info =
+      ResourceRequestInfoImpl::ForRequest(request_);
 
   // Deleted in DownloadManager.
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo(
       base::Time::Now(), content_length_,
-      request()->net_log(), request_info->HasUserGesture(),
+      request_->net_log(), request_info->HasUserGesture(),
       request_info->GetPageTransition()));
 
   // Create the ByteStream for sending data to the download sink.
   scoped_ptr<ByteStreamReader> stream_reader;
   CreateByteStream(
       base::MessageLoopProxy::current(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
       kDownloadByteStreamSize, &stream_writer_, &stream_reader);
   stream_writer_->RegisterCallback(
       base::Bind(&DownloadResourceHandler::ResumeRequest, AsWeakPtr()));
 
   info->download_id = download_id_;
-  info->url_chain = request()->url_chain();
-  info->referrer_url = GURL(request()->referrer());
+  info->url_chain = request_->url_chain();
+  info->referrer_url = GURL(request_->referrer());
   info->start_time = base::Time::Now();
   info->total_bytes = content_length_;
   info->has_user_gesture = request_info->HasUserGesture();
   info->content_disposition = content_disposition_;
   info->mime_type = response->head.mime_type;
-  info->remote_address = request()->GetSocketAddress().host();
+  info->remote_address = request_->GetSocketAddress().host();
   RecordDownloadMimeType(info->mime_type);
   RecordDownloadContentDisposition(info->content_disposition);
 
   info->request_handle =
       DownloadRequestHandle(AsWeakPtr(), request_info->GetChildID(),
                             request_info->GetRouteID(),
                             request_info->GetRequestID());
 
   // Get the last modified time and etag.
-  const net::HttpResponseHeaders* headers = request()->response_headers();
+  const net::HttpResponseHeaders* headers = request_->response_headers();
   if (headers) {
     std::string last_modified_hdr;
     if (headers->EnumerateHeader(NULL, "Last-Modified", &last_modified_hdr))
       info->last_modified = last_modified_hdr;
     if (headers->EnumerateHeader(NULL, "ETag", &etag_))
       info->etag = etag_;
 
     int status = headers->response_code();
     if (2 == status / 100  && status != net::HTTP_PARTIAL_CONTENT) {
       // Success & not range response; if we asked for a range, we didn't
@@ skipping 44 matching lines @@
 }
 
 bool DownloadResourceHandler::OnWillStart(int request_id,
                                           const GURL& url,
                                           bool* defer) {
   return true;
 }
 
 // Create a new buffer, which will be handed to the download thread for file
 // writing and deletion.
-bool DownloadResourceHandler::OnWillRead(int request_id,
-                                         scoped_refptr<net::IOBuffer>* buf,
-                                         int* buf_size,
-                                         int min_size) {
+bool DownloadResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
+                                         int* buf_size, int min_size) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(buf && buf_size);
   DCHECK(!read_buffer_.get());
 
   *buf_size = min_size < 0 ? kReadBufSize : min_size;
   last_buffer_size_ = *buf_size;
   read_buffer_ = new net::IOBuffer(*buf_size);
   *buf = read_buffer_.get();
   return true;
 }
@@ skipping 37 matching lines @@
     *defer = was_deferred_ = true;
 
   return true;
 }
 
 bool DownloadResourceHandler::OnResponseCompleted(
     int request_id,
     const net::URLRequestStatus& status,
     const std::string& security_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  int response_code = status.is_success() ? request()->GetResponseCode() : 0;
+  int response_code = status.is_success() ? request_->GetResponseCode() : 0;
   VLOG(20) << __FUNCTION__ << "()" << DebugString()
            << " request_id = " << request_id
            << " status.status() = " << status.status()
            << " status.error() = " << status.error()
            << " response_code = " << response_code;
 
   net::Error error_code = net::OK;
   if (status.status() == net::URLRequestStatus::FAILED ||
       // Note cancels as failures too.
       status.status() == net::URLRequestStatus::CANCELED) {
@@ skipping 23 matching lines @@
     // the tab from which it came).  We map this to USER_CANCELLED as the
     // case we know about (system suspend because of laptop close) corresponds
     // to a user action.
     // TODO(ahendrickson) -- Find a better set of codes to use here, as
     // CANCELED/ERR_ABORTED can occur for reasons other than user cancel.
     reason = DOWNLOAD_INTERRUPT_REASON_USER_CANCELED;
   }
 
   if (status.is_success() &&
       reason == DOWNLOAD_INTERRUPT_REASON_NONE &&
-      request()->response_headers()) {
+      request_->response_headers()) {
     // Handle server's response codes.
     switch(response_code) {
       case -1:                          // Non-HTTP request.
       case net::HTTP_OK:
       case net::HTTP_CREATED:
       case net::HTTP_ACCEPTED:
       case net::HTTP_NON_AUTHORITATIVE_INFORMATION:
       case net::HTTP_RESET_CONTENT:
       case net::HTTP_PARTIAL_CONTENT:
         // Expected successful codes.
@@ skipping 91 matching lines @@
     total_pause_time_ += (base::TimeTicks::Now() - last_stream_pause_time_);
     last_stream_pause_time_ = base::TimeTicks();
   }
 
   controller()->Resume();
 }
 
 void DownloadResourceHandler::CancelRequest() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  const ResourceRequestInfo* info = GetRequestInfo();
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   ResourceDispatcherHostImpl::Get()->CancelRequest(
       info->GetChildID(),
       info->GetRequestID(),
       false);
 }
 
 std::string DownloadResourceHandler::DebugString() const {
-  const ResourceRequestInfo* info = GetRequestInfo();
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   return base::StringPrintf("{"
                             " url_ = " "\"%s\""
                             " info = {"
                             " child_id = " "%d"
                             " request_id = " "%d"
                             " route_id = " "%d"
                             " }"
                             " }",
-                            request() ?
-                                request()->url().spec().c_str() :
+                            request_ ?
+                                request_->url().spec().c_str() :
                                 "<NULL request>",
                             info->GetChildID(),
                             info->GetRequestID(),
                             info->GetRouteID());
 }
 
 DownloadResourceHandler::~DownloadResourceHandler() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // This won't do anything if the callback was called before.
   // If it goes through, it will likely be because OnWillStart() returned
   // false somewhere in the chain of resource handlers.
   CallStartedCB(NULL, net::ERR_ACCESS_DENIED);
 
   // Remove output stream callback if a stream exists.
   if (stream_writer_)
     stream_writer_->RegisterCallback(base::Closure());
 
   UMA_HISTOGRAM_TIMES("SB2.DownloadDuration",
                       base::TimeTicks::Now() - download_start_time_);
 }
 
 }  // namespace content