Updated latency fixture and refactored connection helper

remoting/test/test_chromoting_client.h

 // Copyright 2015 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 REMOTING_TEST_TEST_CHROMOTING_CLIENT_H_
 #define REMOTING_TEST_TEST_CHROMOTING_CLIENT_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/protocol/clipboard_filter.h"
 #include "remoting/protocol/cursor_shape_stub.h"
 #include "remoting/test/remote_connection_observer.h"
 
 namespace remoting {
 
 class ClientContext;
@@ skipping 42 matching lines @@
   // these callbacks. The callbacks should be used for informational purposes.
   void AddRemoteConnectionObserver(RemoteConnectionObserver* observer);
 
   // Unregisters an observerer from notifications for remote connection events.
   void RemoveRemoteConnectionObserver(RemoteConnectionObserver* observer);
 
   // Used to set a fake/mock connection object for TestChromotingClient tests.
   void SetConnectionToHostForTests(
       scoped_ptr<protocol::ConnectionToHost> connection_to_host);
 
+  // Gets a weak pointer for this object.
+  base::WeakPtr<TestChromotingClient> GetWeakPtr() {

[Sergey Ulanov, 2015/07/23 19:36:55]

I don't think you really need this - see my other comments.
In general it's better to avoid weak pointers when possible (and also
ref-counted objects).

[liaoyuke, 2015/07/24 02:07:28]

Done.

+    return weak_factory_.GetWeakPtr();
+  }
+
  private:
   // ClientUserInterface interface.
   void OnConnectionState(protocol::ConnectionToHost::State state,
                          protocol::ErrorCode error_code) override;
   void OnConnectionReady(bool ready) override;
   void OnRouteChanged(const std::string& channel_name,
                       const protocol::TransportRoute& route) override;
   void SetCapabilities(const std::string& capabilities) override;
   void SetPairingResponse(
       const protocol::PairingResponse& pairing_response) override;
@@ skipping 26 matching lines @@
 
   // Manages the threads and task runners for |chromoting_client_|.
   scoped_ptr<ClientContext> client_context_;
 
   // Processes video packets from the host.
   scoped_ptr<VideoRenderer> video_renderer_;
 
   // Used to establish an XMPP connection with the google talk service.
   scoped_ptr<XmppSignalStrategy> signal_strategy_;
 
+  // Used to weakly bind |this| to methods.
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<TestChromotingClient> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(TestChromotingClient);
 };
 
 }  // namespace test
 }  // namespace remoting
 
 #endif  // REMOTING_TEST_TEST_CHROMOTING_CLIENT_H_