Updating the Chromoting Test Driver to target the test environment

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 <utility>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "remoting/protocol/transport_context.h"
 #include "remoting/signaling/xmpp_signal_strategy.h"
 #include "remoting/test/connection_setup_info.h"
 #include "remoting/test/test_video_renderer.h"
 
 namespace remoting {
 namespace test {
 
 namespace {
 const char kXmppHostName[] = "talk.google.com";
-const int kXmppPortNumber = 5222;
+const int kProdXmppPortNumber = 5222;
+const int kTestXmppPortNumber = 19316;
 
 // Used as the TokenFetcherCallback for App Remoting sessions.
 void FetchThirdPartyToken(
     const std::string& authorization_token,
     const std::string& shared_secret,
     const std::string& token_url,
     const std::string& scope,
     const protocol::ThirdPartyTokenFetchedCallback& token_fetched_callback) {
   VLOG(2) << "FetchThirdPartyToken("
           << "token_url: " << token_url << ", "
@@ skipping 20 matching lines @@
       connection_error_code_(protocol::OK),
       video_renderer_(std::move(video_renderer)) {}
 
 TestChromotingClient::~TestChromotingClient() {
   // Ensure any connections are closed and the members are destroyed in the
   // appropriate order.
   EndConnection();
 }
 
 void TestChromotingClient::StartConnection(
+    bool use_test_api_values,
     const ConnectionSetupInfo& connection_setup_info) {
   // Required to establish a connection to the host.
   jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
   scoped_refptr<URLRequestContextGetter> request_context_getter;
   request_context_getter = new URLRequestContextGetter(
       base::ThreadTaskRunnerHandle::Get(),   // network_runner
       base::ThreadTaskRunnerHandle::Get());  // file_runner
 
   client_context_.reset(new ClientContext(base::ThreadTaskRunnerHandle::Get()));
 
   // Check to see if the user passed in a customized video renderer.
   if (!video_renderer_) {
     video_renderer_.reset(new TestVideoRenderer());
   }
 
   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(
         std::move(test_connection_to_host_));
   }
 
   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.port =
+        use_test_api_values ? kTestXmppPortNumber : kProdXmppPortNumber;
+    xmpp_server_config.use_tls = !use_test_api_values;
     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));
   }
 
   protocol::NetworkSettings network_settings(
@@ skipping 150 matching lines @@
   VLOG(1) << "TestChromotingClient::InjectClipboardEvent() Called";
 }
 
 void TestChromotingClient::SetCursorShape(
     const protocol::CursorShapeInfo& cursor_shape) {
   VLOG(1) << "TestChromotingClient::SetCursorShape() Called";
 }
 
 }  // namespace test
 }  // namespace remoting