diff options
| author | dmichael <dmichael@chromium.org> | 2014-12-19 13:45:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-19 21:47:20 +0000 |
| commit | 0384af32246d208ff816511bfdf7c63a06eead3a (patch) | |
| tree | 4c18fadc7336fe3634d5d9a0a869b517d2291dfb /tools/android | |
| parent | b809205827970c5520645c8e93f9e6cc9e462455 (diff) | |
| download | chromium_src-0384af32246d208ff816511bfdf7c63a06eead3a.zip chromium_src-0384af32246d208ff816511bfdf7c63a06eead3a.tar.gz chromium_src-0384af32246d208ff816511bfdf7c63a06eead3a.tar.bz2 | |
Put HostControllersManager::weak_ptr_factory_ last
BUG=303818
R=michaelbai@chromium.org
Review URL: https://codereview.chromium.org/817833002
Cr-Commit-Position: refs/heads/master@{#309271}
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/forwarder2/host_forwarder_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc index 74f3351..56ce4f2 100644 --- a/tools/android/forwarder2/host_forwarder_main.cc +++ b/tools/android/forwarder2/host_forwarder_main.cc @@ -85,9 +85,9 @@ void KillHandler(int signal_number) { 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() { @@ -291,12 +291,12 @@ class HostControllersManager { 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 { |