gdata: Make WeakPtrFactory the last parameter

chrome/browser/chromeos/gdata/gdata_uploader.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 "chrome/browser/chromeos/gdata/gdata_uploader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 15 matching lines @@
 // Maximum number of times we try to open a file before giving up.
 const int kMaxFileOpenTries = 5;
 
 }  // namespace
 
 namespace gdata {
 
 GDataUploader::GDataUploader(DocumentsServiceInterface* documents_service)
   : documents_service_(documents_service),
     next_upload_id_(0),
-    ALLOW_THIS_IN_INITIALIZER_LIST(uploader_factory_(this)) {
+    ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
 GDataUploader::~GDataUploader() {
 }
 
 int GDataUploader::UploadNewFile(scoped_ptr<UploadFileInfo> upload_file_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(upload_file_info.get());
   DCHECK_EQ(upload_file_info->upload_id, -1);
   DCHECK(!upload_file_info->file_path.empty());
@@ skipping 140 matching lines @@
 }
 
 void GDataUploader::OpenFile(UploadFileInfo* upload_file_info) {
   // Open the file asynchronously.
   const int rv = upload_file_info->file_stream->Open(
       upload_file_info->file_path,
       base::PLATFORM_FILE_OPEN |
       base::PLATFORM_FILE_READ |
       base::PLATFORM_FILE_ASYNC,
       base::Bind(&GDataUploader::OpenCompletionCallback,
-                 uploader_factory_.GetWeakPtr(),
+                 weak_ptr_factory_.GetWeakPtr(),
                  upload_file_info->upload_id));
   DCHECK_EQ(net::ERR_IO_PENDING, rv);
 }
 
 void GDataUploader::OpenCompletionCallback(int upload_id, int result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UploadFileInfo* upload_file_info = GetUploadFileInfo(upload_id);
   if (!upload_file_info)
     return;
@@ skipping 32 matching lines @@
     return;
   }
   documents_service_->InitiateUpload(
       InitiateUploadParams(upload_file_info->upload_mode,
                            upload_file_info->title,
                            upload_file_info->content_type,
                            upload_file_info->content_length,
                            upload_file_info->initial_upload_location,
                            upload_file_info->gdata_path),
       base::Bind(&GDataUploader::OnUploadLocationReceived,
-                 uploader_factory_.GetWeakPtr(),
+                 weak_ptr_factory_.GetWeakPtr(),
                  upload_file_info->upload_id));
 }
 
 void GDataUploader::OnUploadLocationReceived(
     int upload_id,
     GDataErrorCode code,
     const GURL& upload_location) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UploadFileInfo* upload_file_info = GetUploadFileInfo(upload_id);
@@ skipping 53 matching lines @@
     // proceeds to ResumeUpload.
     // TODO(kinaba): http://crbug.com/134814
     // Replace the following PostTask() to an direct method call. This is needed
     // because we have to ResumeUpload after the previous InitiateUpload or
     // ResumeUpload is completely finished; at this point, we are inside the
     // callback function from the previous operation, which is not treated as
     // finished yet.
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(&GDataUploader::ResumeUpload,
-                   uploader_factory_.GetWeakPtr(),
+                   weak_ptr_factory_.GetWeakPtr(),
                    upload_file_info->upload_id));
     return;
   }
 
   upload_file_info->file_stream->Read(
       upload_file_info->buf,
       bytes_to_read,
       base::Bind(&GDataUploader::ReadCompletionCallback,
-                 uploader_factory_.GetWeakPtr(),
+                 weak_ptr_factory_.GetWeakPtr(),
                  upload_file_info->upload_id,
                  bytes_to_read));
 }
 
 void GDataUploader::ReadCompletionCallback(
     int upload_id,
     int bytes_to_read,
     int bytes_read) {
   // The Read is asynchronously executed on BrowserThread::UI, where
   // Read() was called.
@@ skipping 24 matching lines @@
   documents_service_->ResumeUpload(
       ResumeUploadParams(upload_file_info->upload_mode,
                          upload_file_info->start_range,
                          upload_file_info->end_range,
                          upload_file_info->content_length,
                          upload_file_info->content_type,
                          upload_file_info->buf,
                          upload_file_info->upload_location,
                          upload_file_info->gdata_path),
       base::Bind(&GDataUploader::OnResumeUploadResponseReceived,
-                 uploader_factory_.GetWeakPtr(),
+                 weak_ptr_factory_.GetWeakPtr(),
                  upload_file_info->upload_id));
 }
 
 void GDataUploader::OnResumeUploadResponseReceived(
     int upload_id,
     const ResumeUploadResponse& response,
     scoped_ptr<DocumentEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UploadFileInfo* upload_file_info = GetUploadFileInfo(upload_id);
@@ skipping 63 matching lines @@
   if (!callback.is_null())
     callback.Run(error, upload_file_info.Pass());
 }
 
 void GDataUploader::RemoveUpload(int upload_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   pending_uploads_.erase(upload_id);
 }
 
 }  // namespace gdata