Update from https://crrev.com/309415

tools/android/forwarder2/host_forwarder_main.cc

 // Copyright (c) 2012 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.
 
 #include <errno.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
@@ skipping 67 matching lines @@
   if (!g_notifier->Notify() || s_kill_handler_count > 2)
     exit(1);
 }
 
 // Manages HostController instances. There is one HostController instance for
 // each connection being forwarded. Note that forwarding can happen with many
 // devices (identified with a serial id).
 class HostControllersManager {
  public:
   HostControllersManager()
-      : weak_ptr_factory_(this),
-        controllers_(new HostControllerMap()),
-        has_failed_(false) {
+      : controllers_(new HostControllerMap()),
+        has_failed_(false),
+        weak_ptr_factory_(this) {
   }
 
   ~HostControllersManager() {
     if (!thread_.get())
       return;
     // Delete the controllers on the thread they were created on.
     thread_->message_loop_proxy()->DeleteSoon(
         FROM_HERE, controllers_.release());
   }
 
@@ skipping 183 matching lines @@
   }
 
   bool SendMessage(const std::string& msg, Socket* client_socket) {
     bool result = client_socket->WriteString(msg);
     DCHECK(result);
     if (!result)
       has_failed_ = true;
     return result;
   }
 
-  base::WeakPtrFactory<HostControllersManager> weak_ptr_factory_;
   base::hash_map<std::string, int> device_serial_to_adb_port_map_;
   scoped_ptr<HostControllerMap> controllers_;
   bool has_failed_;
   scoped_ptr<base::AtExitManager> at_exit_manager_;  // Needed by base::Thread.
   scoped_ptr<base::Thread> thread_;
+  base::WeakPtrFactory<HostControllersManager> weak_ptr_factory_;
 };
 
 class ServerDelegate : public Daemon::ServerDelegate {
  public:
   ServerDelegate() : has_failed_(false) {}
 
   bool has_failed() const {
     return has_failed_ || controllers_manager_.has_failed();
   }
 
@@ skipping 138 matching lines @@
 
   return client_delegate.has_failed() || daemon_delegate.has_failed();
 }
 
 }  // namespace
 }  // namespace forwarder2
 
 int main(int argc, char** argv) {
   return forwarder2::RunHostForwarder(argc, argv);
 }