Maintaining the proper order of initialization WeakPtrFactory in "src/remoting"

remoting/host/desktop_session_agent.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 "remoting/host/desktop_session_agent.h"
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "ipc/ipc_channel_proxy.h"
@@ skipping 102 matching lines @@
     scoped_refptr<AutoThreadTaskRunner> audio_capture_task_runner,
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
     scoped_refptr<AutoThreadTaskRunner> input_task_runner,
     scoped_refptr<AutoThreadTaskRunner> io_task_runner,
     scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner)
     : audio_capture_task_runner_(audio_capture_task_runner),
       caller_task_runner_(caller_task_runner),
       input_task_runner_(input_task_runner),
       io_task_runner_(io_task_runner),
       video_capture_task_runner_(video_capture_task_runner),
-      control_factory_(this),
       next_shared_buffer_id_(1),
       shared_buffers_(0),
-      started_(false) {
+      started_(false),
+      weak_factory_(this) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 }
 
 bool DesktopSessionAgent::OnMessageReceived(const IPC::Message& message) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   bool handled = true;
   if (started_) {
     IPC_BEGIN_MESSAGE_MAP(DesktopSessionAgent, message)
       IPC_MESSAGE_HANDLER(ChromotingNetworkDesktopMsg_CaptureFrame,
@@ skipping 124 matching lines @@
 
   started_ = true;
   client_jid_ = authenticated_jid;
 
   // Enable the curtain mode.
   delegate_->desktop_environment_factory().SetEnableCurtaining(
       virtual_terminal);
 
   // Create a desktop environment for the new session.
   desktop_environment_ = delegate_->desktop_environment_factory().Create(
-      control_factory_.GetWeakPtr());
+      weak_factory_.GetWeakPtr());
 
   // Create the session controller and set the initial screen resolution.
   screen_controls_ = desktop_environment_->CreateScreenControls();
   SetScreenResolution(resolution);
 
   // Create the input injector.
   input_injector_ = desktop_environment_->CreateInputInjector();
 
   // Hook up the input filter.
   input_tracker_.reset(new protocol::InputEventTracker(input_injector_.get()));
@@ skipping 118 matching lines @@
 
   delegate_.reset();
 
   // Make sure the channel is closed.
   network_channel_.reset();
 
   if (started_) {
     started_ = false;
 
     // Ignore any further callbacks.
-    control_factory_.InvalidateWeakPtrs();
+    weak_factory_.InvalidateWeakPtrs();
     client_jid_.clear();
 
     remote_input_filter_.reset();
 
     // Ensure that any pressed keys or buttons are released.
     input_tracker_->ReleaseAll();
     input_tracker_.reset();
 
     desktop_environment_.reset();
     input_injector_.reset();
@@ skipping 162 matching lines @@
 void DesktopSessionAgent::OnSharedBufferDeleted(int id) {
   DCHECK(video_capture_task_runner_->BelongsToCurrentThread());
   DCHECK(id != 0);
 
   shared_buffers_--;
   DCHECK_GE(shared_buffers_, 0);
   SendToNetwork(new ChromotingDesktopNetworkMsg_ReleaseSharedBuffer(id));
 }
 
 }  // namespace remoting