Replace NewRunnableMethod with Callback in DownloadResourceHandler.

content/browser/download/download_resource_handler.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/download/download_resource_handler.h"
 
 #include <string>
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/stringprintf.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/download/download_buffer.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_request_handle.h"
-#include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/interrupt_reasons.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 86 matching lines @@
       !response->response_head.headers->GetMimeType(&content_type_header))
     content_type_header = "";
   info->original_mime_type = content_type_header;
 
   info->prompt_user_for_save_location =
       save_as_ && save_info_.file_path.empty();
   info->referrer_charset = request_->context()->referrer_charset();
   info->save_info = save_info_;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          download_file_manager_, &DownloadFileManager::StartDownload,
-          info, request_handle));
+      base::Bind(&DownloadFileManager::StartDownload,
+                 download_file_manager_, info, request_handle));
 
   // We can't start saving the data before we create the file on disk.
   // The request will be un-paused in DownloadFileManager::CreateDownloadFile.
   rdh_->PauseRequest(global_id_.child_id, global_id_.request_id, true);
 
   return true;
 }
 
 void DownloadResourceHandler::CallStartedCB(net::Error error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 30 matching lines @@
   // Swap the data.
   net::IOBuffer* io_buffer = NULL;
   read_buffer_.swap(&io_buffer);
   size_t vector_size = buffer_->AddData(io_buffer, *bytes_read);
   bool need_update = (vector_size == 1);  // Buffer was empty.
 
   // We are passing ownership of this buffer to the download file manager.
   if (need_update) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
-        NewRunnableMethod(download_file_manager_,
-                          &DownloadFileManager::UpdateDownload,
-                          download_id_,
-                          buffer_));
+        base::Bind(&DownloadFileManager::UpdateDownload,
+                   download_file_manager_, download_id_, buffer_));
   }
 
   // We schedule a pause outside of the read loop if there is too much file
   // writing work to do.
   if (vector_size > kLoadsToWrite)
     StartPauseTimer();
 
   return true;
 }
 
@@ skipping 24 matching lines @@
     // CANCELED/ERR_ABORTED can occur for reasons other than user cancel.
     reason = DOWNLOAD_INTERRUPT_REASON_USER_CANCELED;  // User canceled.
   }
   if (!download_id_.IsValid())
     CallStartedCB(error_code);
   // We transfer ownership to |DownloadFileManager| to delete |buffer_|,
   // so that any functions queued up on the FILE thread are executed
   // before deletion.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
-      NewRunnableMethod(download_file_manager_,
-                        &DownloadFileManager::OnResponseCompleted,
-                        download_id_,
-                        reason,
-                        security_info));
+      base::Bind(&DownloadFileManager::OnResponseCompleted,
+                 download_file_manager_, download_id_, reason, security_info));
   buffer_ = NULL;  // The buffer is longer needed by |DownloadResourceHandler|.
   read_buffer_ = NULL;
   return true;
 }
 
 void DownloadResourceHandler::OnRequestClosed() {
   UMA_HISTOGRAM_TIMES("SB2.DownloadDuration",
                       base::TimeTicks::Now() - download_start_time_);
 }
 
@@ skipping 51 matching lines @@
                             " render_view_id_ = " "%d"
                             " save_info_.file_path = \"%" PRFilePath "\""
                             " }",
                             request_->url().spec().c_str(),
                             download_id_.local(),
                             global_id_.child_id,
                             global_id_.request_id,
                             render_view_id_,
                             save_info_.file_path.value().c_str());
 }