Updated latency fixture and refactored connection helper

remoting/test/app_remoting_connected_client_fixture.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_APP_REMOTING_CONNECTED_CLIENT_FIXTURE_H_
 #define REMOTING_TEST_APP_REMOTING_CONNECTED_CLIENT_FIXTURE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "remoting/test/remote_connection_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class RunLoop;
 class Timer;
 }
 
 namespace remoting {
 namespace test {
 
 struct RemoteApplicationDetails;
 class AppRemotingConnectionHelper;
+class TestChromotingClient;
+
+// Allows for custom handling of ExtensionMessage messages.
+typedef base::Callback<void(const protocol::ExtensionMessage& message)>
+    HostMessageReceivedCallback;
 
 // Creates a connection to a remote host which is available for tests to use.
 // All callbacks must occur on the same thread the object was created on.
 class AppRemotingConnectedClientFixture
-    : public testing::TestWithParam<const char*> {
+    : public testing::TestWithParam<const char*>,
+      public RemoteConnectionObserver {
  public:
   AppRemotingConnectedClientFixture();
   ~AppRemotingConnectedClientFixture() override;
 
  protected:
   // Sends the request to the host and waits for a reply up to |max_wait_time|.
   // Returns true if we received a response within the maximum time limit.
   bool VerifyResponseForSimpleHostMessage(
       const std::string& message_request_title,
       const std::string& message_response_title,
       const std::string& message_payload,
       const base::TimeDelta& max_wait_time);
 
  private:
   // testing::Test interface.
   void SetUp() override;
   void TearDown() override;
 
+  // RemoteConnectionObserver interface.
+  void HostMessageReceived(const protocol::ExtensionMessage& message) override;
+
+  // Handles messages from the host.
+  void HandleOnHostMessage(const remoting::protocol::ExtensionMessage& message);
+
   // Contains the details for the application being tested.
   const RemoteApplicationDetails& application_details_;
 
   // Used to run the thread's message loop.
   scoped_ptr<base::RunLoop> run_loop_;
 
   // Used for setting timeouts and delays.
   scoped_ptr<base::Timer> timer_;
 
   // Used to ensure RemoteConnectionObserver methods are called on the same
   // thread.
   base::ThreadChecker thread_checker_;
 
   // Creates and manages the connection to the remote host.
   scoped_ptr<AppRemotingConnectionHelper> connection_helper_;
 
+  // Using WeakPtr to keep a reference to TestChromotingClient while let the
+  // AppRemotingConnectionHelper own its lifetime.
+  base::WeakPtr<TestChromotingClient> test_chromoting_client_;

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

I don't think you really need this to be a weak pointer. This object is owned by
connection_helper_ owned by this class. So it's safe to make this a raw pointer
(i.e. TestChromotingClient*). But a better solution is to add an accessor in the
ConnectionHelper to get test client.

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

Done.

+
+  // Called when an ExtensionMessage is received from the host.
+  HostMessageReceivedCallback host_message_received_callback_;
+
   DISALLOW_COPY_AND_ASSIGN(AppRemotingConnectedClientFixture);
 };
 
 }  // namespace test
 }  // namespace remoting
 
 #endif  // REMOTING_TEST_APP_REMOTING_CONNECTED_CLIENT_FIXTURE_H_