Revert 149576 - gdata: Make WeakPtrFactory the last parameter

chrome/browser/chromeos/gdata/gdata_uploader.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 116 matching lines @@
   // Pointers to DocumentsServiceInterface object owned by GDataSystemService.
   // The lifetime of this object is guaranteed to exceed that of the
   // GDataUploader instance.
   DocumentsServiceInterface* documents_service_;
 
   int next_upload_id_;  // id counter.
 
   typedef std::map<int, UploadFileInfo*> UploadFileInfoMap;
   UploadFileInfoMap pending_uploads_;
 
-  // Note: This should remain the last member so it'll be destroyed and
-  // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<GDataUploader> weak_ptr_factory_;
+  // Factory for various callbacks.
+  base::WeakPtrFactory<GDataUploader> uploader_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataUploader);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_