Simplify ConnectionToHost interface.

remoting/test/test_chromoting_client.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/test_chromoting_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 89 matching lines @@
   chromoting_client_.reset(new ChromotingClient(client_context_.get(),
                                                 this,  // client_user_interface.
                                                 video_renderer_.get(),
                                                 nullptr));  // audio_player
 
   if (test_connection_to_host_) {
     chromoting_client_->SetConnectionToHostForTests(
         test_connection_to_host_.Pass());
   }
 
-  XmppSignalStrategy::XmppServerConfig xmpp_server_config;
-  xmpp_server_config.host = kXmppHostName;
-  xmpp_server_config.port = kXmppPortNumber;
-  xmpp_server_config.use_tls = true;
-  xmpp_server_config.username = connection_setup_info.user_name;
-  xmpp_server_config.auth_token = connection_setup_info.access_token;
+  if (!signal_strategy_) {
+    XmppSignalStrategy::XmppServerConfig xmpp_server_config;
+    xmpp_server_config.host = kXmppHostName;
+    xmpp_server_config.port = kXmppPortNumber;
+    xmpp_server_config.use_tls = true;
+    xmpp_server_config.username = connection_setup_info.user_name;
+    xmpp_server_config.auth_token = connection_setup_info.access_token;
 
-  // Set up the signal strategy.  This must outlive the client object.
-  signal_strategy_.reset(
-      new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(),
-                             request_context_getter, xmpp_server_config));
+    // Set up the signal strategy.  This must outlive the client object.
+    signal_strategy_.reset(
+        new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(),
+                               request_context_getter, xmpp_server_config));
+  }
 
   protocol::NetworkSettings network_settings(
       protocol::NetworkSettings::NAT_TRAVERSAL_FULL);
 
   scoped_ptr<protocol::ChromiumPortAllocatorFactory> port_allocator_factory(
       new protocol::ChromiumPortAllocatorFactory(request_context_getter));
 
   scoped_refptr<protocol::TransportContext> transport_context(
       new protocol::TransportContext(
           signal_strategy_.get(), port_allocator_factory.Pass(),
@@ skipping 49 matching lines @@
   connection_observers_.AddObserver(observer);
 }
 
 void TestChromotingClient::RemoveRemoteConnectionObserver(
     RemoteConnectionObserver* observer) {
   DCHECK(observer);
 
   connection_observers_.RemoveObserver(observer);
 }
 
+void TestChromotingClient::SetSignalStrategyForTests(
+    scoped_ptr<SignalStrategy> signal_strategy) {
+  signal_strategy_ = signal_strategy.Pass();
+}
+
 void TestChromotingClient::SetConnectionToHostForTests(
     scoped_ptr<protocol::ConnectionToHost> connection_to_host) {
   test_connection_to_host_ = connection_to_host.Pass();
 }
 
 void TestChromotingClient::OnConnectionState(
     protocol::ConnectionToHost::State state,
     protocol::ErrorCode error_code) {
   VLOG(1) << "TestChromotingClient::OnConnectionState("
           << "state: " << protocol::ConnectionToHost::StateToString(state)
@@ skipping 71 matching lines @@
   VLOG(1) << "TestChromotingClient::InjectClipboardEvent() Called";
 }
 
 void TestChromotingClient::SetCursorShape(
     const protocol::CursorShapeInfo& cursor_shape) {
   VLOG(1) << "TestChromotingClient::SetCursorShape() Called";
 }
 
 }  // namespace test
 }  // namespace remoting