Remaining cleanup (base::Bind): Replacing FileUtilProxy calls with new callback

webkit/blob/blob_url_request_job.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 "webkit/blob/blob_url_request_job.h"
 
+#include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
@@ skipping 27 matching lines @@
 
 static const int kFileOpenFlags = base::PLATFORM_FILE_OPEN |
                                   base::PLATFORM_FILE_READ |
                                   base::PLATFORM_FILE_ASYNC;
 
 BlobURLRequestJob::BlobURLRequestJob(
     net::URLRequest* request,
     BlobData* blob_data,
     base::MessageLoopProxy* file_thread_proxy)
     : net::URLRequestJob(request),
-      callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       blob_data_(blob_data),
       file_thread_proxy_(file_thread_proxy),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           io_callback_(this, &BlobURLRequestJob::DidRead)),
       item_index_(0),
       total_size_(0),
       current_item_offset_(0),
       remaining_bytes_(0),
       read_buf_offset_(0),
       read_buf_size_(0),
@@ skipping 39 matching lines @@
   if (stream_ != NULL) {
     stream_->Close();
     stream_.reset(NULL);
   }
 }
 
 void BlobURLRequestJob::Kill() {
   CloseStream();
 
   net::URLRequestJob::Kill();
-  callback_factory_.RevokeAll();
+  weak_factory_.InvalidateWeakPtrs();
   method_factory_.RevokeAll();
 }
 
 void BlobURLRequestJob::ResolveFile(const FilePath& file_path) {
   base::FileUtilProxy::GetFileInfo(
         file_thread_proxy_,
         file_path,
-        callback_factory_.NewCallback(&BlobURLRequestJob::DidResolve));
+        base::Bind(&BlobURLRequestJob::DidResolve,
+                   weak_factory_.GetWeakPtr()));
 }
 
 void BlobURLRequestJob::DidResolve(base::PlatformFileError rv,
                                    const base::PlatformFileInfo& file_info) {
   // If an error occured, bail out.
   if (rv == base::PLATFORM_FILE_ERROR_NOT_FOUND) {
     NotifyFailure(net::ERR_FILE_NOT_FOUND);
     return;
   } else if (rv != base::PLATFORM_FILE_OK) {
     NotifyFailure(net::ERR_FAILED);
@@ skipping 177 matching lines @@
   return true;
 }
 
 bool BlobURLRequestJob::DispatchReadFile(const BlobData::Item& item) {
   // If the stream already exists, keep reading from it.
   if (stream_ != NULL)
     return ReadFile(item);
 
   base::FileUtilProxy::CreateOrOpen(
       file_thread_proxy_, item.file_path(), kFileOpenFlags,
-      callback_factory_.NewCallback(&BlobURLRequestJob::DidOpen));
+      base::Bind(&BlobURLRequestJob::DidOpen,
+                 weak_factory_.GetWeakPtr()));
   SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
   return false;
 }
 
 void BlobURLRequestJob::DidOpen(base::PlatformFileError rv,
                                 base::PassPlatformFile file,
                                 bool created) {
   if (rv != base::PLATFORM_FILE_OK) {
     NotifyFailure(net::ERR_FAILED);
     return;
@@ skipping 230 matching lines @@
         // We don't support multiple range requests in one single URL request,
         // because we need to do multipart encoding here.
         // TODO(jianli): Support multipart byte range requests.
         NotifyFailure(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE);
       }
     }
   }
 }
 
 }  // namespace webkit_blob