Index: chrome/browser/chromeos/gdata/gdata_file_system.h |
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.h b/chrome/browser/chromeos/gdata/gdata_file_system.h |
index caca8b58af795a6140c2c5e7cba9409b6d4e6afe..726fefaed45dfa3f2be01616e3570ac4002affb2 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_file_system.h |
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.h |
@@ -874,13 +874,13 @@ class GDataFileSystem : public GDataFileSystemInterface, |
scoped_ptr<PrefChangeRegistrar> pref_registrar_; |
- // WeakPtrFactory and WeakPtr bound to the UI thread. |
- base::WeakPtrFactory<GDataFileSystem> ui_weak_ptr_factory_; |
- base::WeakPtr<GDataFileSystem> ui_weak_ptr_; |
- |
ObserverList<Observer> observers_; |
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; |
+ |
+ // 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<GDataFileSystem> weak_ptr_factory_; |
}; |
} // namespace gdata |