Index: chrome/browser/chromeos/gdata/gdata_cache.h |
=================================================================== |
--- chrome/browser/chromeos/gdata/gdata_cache.h (revision 149581) |
+++ chrome/browser/chromeos/gdata/gdata_cache.h (working copy) |
@@ -430,12 +430,13 @@ |
// The cache state data. This member must be access only on the blocking pool. |
scoped_ptr<GDataCacheMetadata> metadata_; |
+ // WeakPtrFactory and WeakPtr bound to the UI thread. |
+ base::WeakPtrFactory<GDataCache> ui_weak_ptr_factory_; |
+ base::WeakPtr<GDataCache> ui_weak_ptr_; |
+ |
// List of observers, this member must be accessed on UI thread. |
ObserverList<Observer> observers_; |
- // 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<GDataCache> weak_ptr_factory_; |
DISALLOW_COPY_AND_ASSIGN(GDataCache); |
}; |