Fix WeakPtrFactory ordering problems in src/tools

tools/android/forwarder2/self_deleter_helper.h

 // Copyright 2013 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 TOOLS_ANDROID_FORWARDER2_SELF_DELETER_HELPER_H_
 #define TOOLS_ANDROID_FORWARDER2_SELF_DELETER_HELPER_H_
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 81 matching lines @@
 //   scoped_ptr<Object> object_;
 // };
 //
 template <typename T>
 class SelfDeleterHelper {
  public:
   typedef base::Callback<void (scoped_ptr<T>)> DeletionCallback;
 
   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() {
     DCHECK(construction_runner_->RunsTasksOnCurrentThread());
   }
 
   void MaybeSelfDeleteSoon() {
     DCHECK(!construction_runner_->RunsTasksOnCurrentThread());
     construction_runner_->PostTask(
         FROM_HERE,
         base::Bind(&SelfDeleterHelper::SelfDelete,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
  private:
   void SelfDelete() {
     DCHECK(construction_runner_->RunsTasksOnCurrentThread());
     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_;
 
+  //WeakPtrFactory's documentation says:
+  // Member variables should appear before the WeakPtrFactory, to ensure
+  // that any WeakPtrs to Controller are invalidated before its members
+  // variable's destructors are executed, rendering them invalid.
+  base::WeakPtrFactory<SelfDeleterHelper<T> > weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(SelfDeleterHelper);
 };
 
 }  // namespace forwarder2
 
 #endif  // TOOLS_ANDROID_FORWARDER2_SELF_DELETER_HELPER_H_