Updated latency fixture and refactored connection helper

remoting/test/app_remoting_connected_client_fixture.cc

 // 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.
 
 #include "remoting/test/app_remoting_connected_client_fixture.h"
 
+#include "base/callback_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/test/app_remoting_connection_helper.h"
 #include "remoting/test/app_remoting_test_driver_environment.h"
 #include "remoting/test/remote_application_details.h"
@@ skipping 23 matching lines @@
           AppRemotingSharedData->GetDetailsFromAppName(GetParam())),
       timer_(new base::Timer(true, false)) {
 }
 
 AppRemotingConnectedClientFixture::~AppRemotingConnectedClientFixture() {
 }
 
 void AppRemotingConnectedClientFixture::SetUp() {
   connection_helper_.reset(
       new AppRemotingConnectionHelper(application_details_));
-  connection_helper_->Initialize(make_scoped_ptr(new TestChromotingClient()));
+  scoped_ptr<TestChromotingClient> test_chromoting_client(
+      new TestChromotingClient());
+
+  test_chromoting_client->AddRemoteConnectionObserver(this);
+
+  connection_helper_->Initialize(test_chromoting_client.Pass());
   if (!connection_helper_->StartConnection()) {
     LOG(ERROR) << "Remote host connection could not be established.";
     FAIL();
   }
 }
 
 void AppRemotingConnectedClientFixture::TearDown() {
+  connection_helper_->GetTestChromotingClient()->RemoveRemoteConnectionObserver(
+      this);
   connection_helper_.reset();
 }
 
+void AppRemotingConnectedClientFixture::HostMessageReceived(
+    const protocol::ExtensionMessage& message) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (!host_message_received_callback_.is_null()) {
+    host_message_received_callback_.Run(message);
+  }
+}
+
 bool AppRemotingConnectedClientFixture::VerifyResponseForSimpleHostMessage(
     const std::string& message_request_title,
     const std::string& message_response_title,
     const std::string& message_payload,
     const base::TimeDelta& max_wait_time) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   bool message_received = false;
 
   DCHECK(!run_loop_ || !run_loop_->running());
   run_loop_.reset(new base::RunLoop());
 
-  HostMessageReceivedCallback host_message_received_callback_ =
+  host_message_received_callback_ =
       base::Bind(&SimpleHostMessageHandler, message_response_title,
                  message_payload, run_loop_->QuitClosure(), &message_received);
-  connection_helper_->SetHostMessageReceivedCallback(
-      host_message_received_callback_);
 
   protocol::ExtensionMessage message;
   message.set_type(message_request_title);
   message.set_data(message_payload);
   connection_helper_->host_stub()->DeliverClientMessage(message);
 
   DCHECK(!timer_->IsRunning());
   timer_->Start(FROM_HERE, max_wait_time, run_loop_->QuitClosure());
 
   run_loop_->Run();
   timer_->Stop();

[joedow, 2015/07/24 13:50:58]

Do you want to reset host_message_received_callback_ here since it has served
its purpose by this point?

[liaoyuke, 2015/07/25 01:43:49]

Done.

 
   return message_received;
 }
 
 }  // namespace test
 }  // namespace remoting