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

remoting/host/client_session.h

Index: remoting/host/client_session.h
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index f9fdd3bd5c25de4e63bc9839a8b1d2cfe2ba76cf..e516f70f04651c0789e7f00df0584d2e9adb4d2f 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -173,10 +173,6 @@ class ClientSession
 
   std::string client_jid_;
 
-  // Used to disable callbacks to |this| once DisconnectSession() has been
-  // called.
-  base::WeakPtrFactory<ClientSessionControl> control_factory_;
-
   // Used to create a DesktopEnvironment instance for this session.
   DesktopEnvironmentFactory* desktop_environment_factory_;
 
@@ -208,11 +204,6 @@ class ClientSession
   protocol::InputFilter auth_input_filter_;
   protocol::ClipboardFilter auth_clipboard_filter_;
 
-  // Factory for weak pointers to the client clipboard stub.
-  // This must appear after |clipboard_echo_filter_|, so that it won't outlive
-  // it.
-  base::WeakPtrFactory<protocol::ClipboardStub> client_clipboard_factory_;

[Wez, 2014/09/18 17:53:57]

This can stay where it is, since it doesn't refer to |this|.

-
   // The maximum duration of this session.
   // There is no maximum if this value is <= 0.
   base::TimeDelta max_duration_;
@@ -263,6 +254,15 @@ class ClientSession
   bool lossless_video_encode_;
   bool lossless_video_color_;
 
+  // Used to disable callbacks to |this| once DisconnectSession() has been
+  // called.
+  base::WeakPtrFactory<ClientSessionControl> weak_factory_;
+
+  // Factory for weak pointers to the client clipboard stub.
+  // This must appear after |clipboard_echo_filter_|, so that it won't outlive
+  // it.
+  base::WeakPtrFactory<protocol::ClipboardStub> client_clipboard_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };