Use ClientAuthenticationConfig in PairingClientAuthenticator

remoting/protocol/authenticator.h

Index: remoting/protocol/authenticator.h
diff --git a/remoting/protocol/authenticator.h b/remoting/protocol/authenticator.h
index 8b89111ba4379e2639d4970a3ddc23093f638ec2..f89710176e398d41198e85cb72739657192c5b18 100644
--- a/remoting/protocol/authenticator.h
+++ b/remoting/protocol/authenticator.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace buzz {
@@ -20,32 +20,6 @@ namespace protocol {
 class Authenticator;
 class ChannelAuthenticator;
 
-typedef base::Callback<void(const std::string& secret)> SecretFetchedCallback;
-typedef base::Callback<void(
-    bool pairing_supported,
-    const SecretFetchedCallback& secret_fetched_callback)> FetchSecretCallback;
-
-// Callback passed to |FetchTokenCallback|, and called once the client
-// authentication finishes. |token| is an opaque string that should be sent
-// directly to the host. |shared_secret| should be used by the client to
-// create a V2Authenticator. In case of failure, the callback is called with
-// an empty |token| and |shared_secret|.
-typedef base::Callback<void(const std::string& token,
-                            const std::string& shared_secret)>
-    ThirdPartyTokenFetchedCallback;
-
-// Fetches a third party token from |token_url|. |host_public_key| is sent to
-// the server so it can later authenticate the host. |scope| is a string with a
-// space-separated list of attributes for this connection (e.g.
-// "hostjid:abc@example.com/123 clientjid:def@example.org/456".
-// |token_fetched_callback| is called when the client authentication ends, on
-// the same thread on which FetchThirdPartyTokenCallback was originally called.
-typedef base::Callback<void(
-    const std::string& token_url,
-    const std::string& scope,
-    const ThirdPartyTokenFetchedCallback& token_fetched_callback)>
-    FetchThirdPartyTokenCallback;
-
 // Authenticator is an abstract interface for authentication protocol
 // implementations. Different implementations of this interface may be used on
 // each side of the connection depending of type of the auth protocol. Client