Revert of Move NegotiatingClientAuthentication creation to ChromotingClient.

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 <vector>
 
@@ skipping 108 matching lines @@
       protocol::NetworkSettings::NAT_TRAVERSAL_FULL);
 
   scoped_refptr<protocol::TransportContext> transport_context(
       new protocol::TransportContext(
           signal_strategy_.get(),
           make_scoped_ptr(new protocol::ChromiumPortAllocatorFactory()),
           make_scoped_ptr(
               new ChromiumUrlRequestFactory(request_context_getter)),
           network_settings, protocol::TransportRole::CLIENT));
 
-  protocol::ClientAuthenticationConfig client_auth_config;
-  client_auth_config.host_id = connection_setup_info.host_id;
-  client_auth_config.pairing_client_id = connection_setup_info.pairing_id;
-  client_auth_config.pairing_secret = connection_setup_info.shared_secret;
-
+  protocol::FetchSecretCallback fetch_secret_callback;
   if (!connection_setup_info.pin.empty()) {
-    client_auth_config.fetch_secret_callback =
-        base::Bind(&FetchSecret, connection_setup_info.pin);
+    fetch_secret_callback = base::Bind(&FetchSecret, connection_setup_info.pin);
   }
 
-  client_auth_config.fetch_third_party_token_callback = base::Bind(
-      &FetchThirdPartyToken, connection_setup_info.authorization_code,
-      connection_setup_info.shared_secret);
+  protocol::FetchThirdPartyTokenCallback fetch_third_party_token_callback =
+      base::Bind(&FetchThirdPartyToken,
+                 connection_setup_info.authorization_code,
+                 connection_setup_info.shared_secret);
 
-  chromoting_client_->Start(signal_strategy_.get(), client_auth_config,
-                            transport_context, connection_setup_info.host_jid,
-                            connection_setup_info.capabilities);
+  scoped_ptr<protocol::Authenticator> authenticator(
+      new protocol::NegotiatingClientAuthenticator(
+          connection_setup_info.pairing_id, connection_setup_info.shared_secret,
+          connection_setup_info.host_id, fetch_secret_callback,
+          fetch_third_party_token_callback));
+
+  chromoting_client_->Start(
+      signal_strategy_.get(), std::move(authenticator), transport_context,
+      connection_setup_info.host_jid, connection_setup_info.capabilities);
 }
 
 void TestChromotingClient::EndConnection() {
   // Clearing out the client will close the connection.
   chromoting_client_.reset();
 
   // The signal strategy object must outlive the client so destroy it next.
   signal_strategy_.reset();
 
   // The connection state will be updated when the chromoting client was
@@ skipping 109 matching lines @@
   VLOG(1) << "TestChromotingClient::InjectClipboardEvent() Called";
 }
 
 void TestChromotingClient::SetCursorShape(
     const protocol::CursorShapeInfo& cursor_shape) {
   VLOG(1) << "TestChromotingClient::SetCursorShape() Called";
 }
 
 }  // namespace test
 }  // namespace remoting