Revert of Move NegotiatingClientAuthentication creation to ChromotingClient. (patchset #2 id:40001 of https://codereview.chromium.org/1778023002/ )

Reason for revert:
Appears to be breaking compile on Linux and Mac:
https://build.chromium.org/p/chromium/builders/Linux/builds/72875

https://build.chromium.org/p/chromium/builders/Mac/builds/13060

Output:

FAILED: /b/build/slave/Linux/build/src/build/goma/client/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ ... -c ../../remoting/test/chromoting_test_fixture.cc -o obj/remoting/test/chromoting_test_driver.chromoting_test_fixture.o
In file included from ../../remoting/test/chromoting_test_fixture.cc:14:
In file included from ../../remoting/test/test_chromoting_client.h:14:
In file included from ../../remoting/client/chromoting_client.h:19:
In file included from ../../remoting/protocol/negotiating_client_authenticator.h:15:
In file included from ../../remoting/protocol/negotiating_authenticator_base.h:16:
../../third_party/webrtc/libjingle/xmllite/xmlelement.h:17:10: fatal error: 'webrtc/libjingle/xmllite/qname.h' file not found
#include "webrtc/libjingle/xmllite/qname.h"
         ^
1 error generated.
ninja: build stopped: subcommand failed.

Original issue's description:
> Move NegotiatingClientAuthentication creation to ChromotingClient.
>
> For the new SPAKE2 authenticator we need to pass client_jid
> to the authenticator. This wasn't possible previously because
> NegotiatingClientAuthenticator was created before signaling is
> connected. Moved NegotiatingClientAuthentication creation to
> ChromotingClient.
>
> BUG=589698
>
> Committed: https://crrev.com/279bf7c76a3e0bfbbd28748d0d02fcead88f4436
> Cr-Commit-Position: refs/heads/master@{#380779}

TBR=jamiewalch@chromium.org,sergeyu@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=589698

Review URL: https://codereview.chromium.org/1788943002

Cr-Commit-Position: refs/heads/master@{#380785}

2 files changed, 23 insertions, 19 deletions

diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index d8a9643..cfbe304 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -388,15 +388,17 @@ class ProtocolPerfTest
             host_signaling_.get(), std::move(port_allocator_factory), nullptr,
             network_settings, protocol::TransportRole::CLIENT));
 
-    protocol::ClientAuthenticationConfig client_auth_config;
-    client_auth_config.host_id = kHostId;
-    client_auth_config.fetch_secret_callback =
-        base::Bind(&ProtocolPerfTest::FetchPin, base::Unretained(this));
-
+    scoped_ptr<protocol::Authenticator> client_authenticator(
+        new protocol::NegotiatingClientAuthenticator(
+            std::string(),  // client_pairing_id
+            std::string(),  // client_pairing_secret
+            kHostId,
+            base::Bind(&ProtocolPerfTest::FetchPin, base::Unretained(this)),
+            protocol::FetchThirdPartyTokenCallback()));
     client_.reset(
         new ChromotingClient(client_context_.get(), this, this, nullptr));
     client_->set_protocol_config(protocol_config_->Clone());
-    client_->Start(client_signaling_.get(), client_auth_config,
+    client_->Start(client_signaling_.get(), std::move(client_authenticator),
                    transport_context, kHostJid, std::string());
   }
 
diff --git a/remoting/test/test_chromoting_client.cc b/remoting/test/test_chromoting_client.cc
index 9bc33ca..917980c 100644
--- a/remoting/test/test_chromoting_client.cc
+++ b/remoting/test/test_chromoting_client.cc
@@ -126,23 +126,25 @@ void TestChromotingClient::StartConnection(
               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);
+
+  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(), client_auth_config,
-                            transport_context, connection_setup_info.host_jid,
-                            connection_setup_info.capabilities);
+  chromoting_client_->Start(
+      signal_strategy_.get(), std::move(authenticator), transport_context,
+      connection_setup_info.host_jid, connection_setup_info.capabilities);
 }
 
 void TestChromotingClient::EndConnection() {