Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1316)

Unified Diff: tools/android/forwarder2/self_deleter_helper.h

Issue 555093002: Fix WeakPtrFactory ordering problems in src/tools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/android/forwarder2/self_deleter_helper.h
diff --git a/tools/android/forwarder2/self_deleter_helper.h b/tools/android/forwarder2/self_deleter_helper.h
index a9d749865d44ac4d76c1679e5389e921fa511a6d..ee6d99a01e5cb4aae420fe9893c8d687ada05cbb 100644
--- a/tools/android/forwarder2/self_deleter_helper.h
+++ b/tools/android/forwarder2/self_deleter_helper.h
@@ -99,10 +99,10 @@ class SelfDeleterHelper {
SelfDeleterHelper(T* self_deleting_object,
const DeletionCallback& deletion_callback)
- : weak_ptr_factory_(this),
- construction_runner_(base::MessageLoopProxy::current()),
+ : construction_runner_(base::MessageLoopProxy::current()),
self_deleting_object_(self_deleting_object),
- deletion_callback_(deletion_callback) {
+ deletion_callback_(deletion_callback),
+ weak_ptr_factory_(this) {
}
~SelfDeleterHelper() {
@@ -123,11 +123,12 @@ class SelfDeleterHelper {
deletion_callback_.Run(make_scoped_ptr(self_deleting_object_));
}
- base::WeakPtrFactory<SelfDeleterHelper<T> > weak_ptr_factory_;
const scoped_refptr<base::SingleThreadTaskRunner> construction_runner_;
T* const self_deleting_object_;
const DeletionCallback deletion_callback_;
+ base::WeakPtrFactory<SelfDeleterHelper<T> > weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(SelfDeleterHelper);
};
« tools/android/forwarder2/device_controller.h ('K') | « tools/android/forwarder2/device_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698