Revert 149576 - gdata: Make WeakPtrFactory the last parameter

chrome/browser/chromeos/gdata/gdata_uploader.cc

Index: chrome/browser/chromeos/gdata/gdata_uploader.cc
===================================================================
--- chrome/browser/chromeos/gdata/gdata_uploader.cc	(revision 149581)
+++ chrome/browser/chromeos/gdata/gdata_uploader.cc	(working copy)
@@ -33,7 +33,7 @@
 GDataUploader::GDataUploader(DocumentsServiceInterface* documents_service)
   : documents_service_(documents_service),
     next_upload_id_(0),
-    ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
+    ALLOW_THIS_IN_INITIALIZER_LIST(uploader_factory_(this)) {
 }
 
 GDataUploader::~GDataUploader() {
@@ -194,7 +194,7 @@
       base::PLATFORM_FILE_READ |
       base::PLATFORM_FILE_ASYNC,
       base::Bind(&GDataUploader::OpenCompletionCallback,
-                 weak_ptr_factory_.GetWeakPtr(),
+                 uploader_factory_.GetWeakPtr(),
                  upload_file_info->upload_id));
   DCHECK_EQ(net::ERR_IO_PENDING, rv);
 }
@@ -247,7 +247,7 @@
                            upload_file_info->initial_upload_location,
                            upload_file_info->gdata_path),
       base::Bind(&GDataUploader::OnUploadLocationReceived,
-                 weak_ptr_factory_.GetWeakPtr(),
+                 uploader_factory_.GetWeakPtr(),
                  upload_file_info->upload_id));
 }
 
@@ -321,7 +321,7 @@
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(&GDataUploader::ResumeUpload,
-                   weak_ptr_factory_.GetWeakPtr(),
+                   uploader_factory_.GetWeakPtr(),
                    upload_file_info->upload_id));
     return;
   }
@@ -330,7 +330,7 @@
       upload_file_info->buf,
       bytes_to_read,
       base::Bind(&GDataUploader::ReadCompletionCallback,
-                 weak_ptr_factory_.GetWeakPtr(),
+                 uploader_factory_.GetWeakPtr(),
                  upload_file_info->upload_id,
                  bytes_to_read));
 }
@@ -375,7 +375,7 @@
                          upload_file_info->upload_location,
                          upload_file_info->gdata_path),
       base::Bind(&GDataUploader::OnResumeUploadResponseReceived,
-                 weak_ptr_factory_.GetWeakPtr(),
+                 uploader_factory_.GetWeakPtr(),
                  upload_file_info->upload_id));
 }