Index: chrome/browser/chromeos/gdata/gdata_uploader.h |
diff --git a/chrome/browser/chromeos/gdata/gdata_uploader.h b/chrome/browser/chromeos/gdata/gdata_uploader.h |
index 970bede7d36a9df2bc2fa7cab286540894cb0af2..232d1e067e53b00cb15eb71eeccd0dda9ec57df4 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_uploader.h |
+++ b/chrome/browser/chromeos/gdata/gdata_uploader.h |
@@ -134,8 +134,9 @@ class GDataUploader : public GDataUploaderInterface { |
typedef std::map<int, UploadFileInfo*> UploadFileInfoMap; |
UploadFileInfoMap pending_uploads_; |
- // Factory for various callbacks. |
- base::WeakPtrFactory<GDataUploader> uploader_factory_; |
+ // 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_; |
DISALLOW_COPY_AND_ASSIGN(GDataUploader); |
}; |