Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

remoting/protocol/authenticator.h

 // Copyright (c) 2012 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.
 
 #ifndef REMOTING_PROTOCOL_AUTHENTICATOR_H_
 #define REMOTING_PROTOCOL_AUTHENTICATOR_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
 
 namespace remoting {
 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;
 
 // 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 and host will repeatedly call their Authenticators
-// and deliver the messages they generate, until successful
-// authentication is reported.
+// implementations. Different implementations of this interface may be used on
+// each side of the connection depending of type of the authprotocol. Client and

[Jamie, 2016/03/07 21:40:18]

s/authprotocol/auth protocol/

[Sergey Ulanov, 2016/03/07 22:45:05]

Done.

+// host will repeatedly call their Authenticators and deliver the messages they
+// generate, until successful authentication is reported.
 //
-// Authenticator may exchange multiple messages before session is
-// authenticated. Each message sent/received by an Authenticator is
-// delivered either in a session description inside session-initiate
-// and session-accept messages or in a session-info
-// message. Session-info messages are used only if authenticators need
-// to exchange more than one message.
+// Authenticator may exchange multiple messages before session is authenticated.
+// Each message sent/received by an Authenticator is delivered either in a
+// session description inside session-initiate and session-accept messages or in
+// a session-info message. Session-info messages are used only if authenticators
+// need to exchange more than one message.
 class Authenticator {
  public:
   // Allowed state transitions:
   // When ProcessMessage() is called:
   //    WAITING_MESSAGE -> MESSAGE_READY
   //    WAITING_MESSAGE -> ACCEPTED
   //    WAITING_MESSAGE -> REJECTED
   //    WAITING_MESSAGE -> PROCESSING_MESSAGE
   // After asynchronous message processing finishes:
   ///   PROCESSING_MESSAGE -> MESSAGE_READY
@@ skipping 15 matching lines @@
 
     // Asynchronously processing the last message from the peer.
     PROCESSING_MESSAGE,
   };
 
   enum RejectionReason {
     INVALID_CREDENTIALS,
     PROTOCOL_ERROR,
   };
 
+  // Callback used for layered Authenticator implementations, particularly
+  // third-party and pairing authenticators. They use this callback to create
+  // base SPAKE2 authenticators.
+  typedef base::Callback<scoped_ptr<Authenticator>(
+      const std::string& shared_secret,
+      Authenticator::State initial_state)>
+      CreateBaseAuthenticatorCallback;
+
   // Returns true if |message| is an Authenticator message.
   static bool IsAuthenticatorMessage(const buzz::XmlElement* message);
 
   // Creates an empty Authenticator message, owned by the caller.
   static scoped_ptr<buzz::XmlElement> CreateEmptyAuthenticatorMessage();
 
   // Finds Authenticator message among child elements of |message|, or
   // returns nullptr otherwise.
   static const buzz::XmlElement* FindAuthenticatorMessage(
       const buzz::XmlElement* message);
 
   Authenticator() {}
   virtual ~Authenticator() {}
 
   // Returns current state of the authenticator.
   virtual State state() const = 0;
 
   // Returns whether authentication has started. The chromoting host uses this
-  // method to starts the back off process to prevent malicious clients from
+  // method to start the back off process to prevent malicious clients from
   // guessing the PIN by spamming the host with auth requests.
   virtual bool started() const = 0;
 
   // Returns rejection reason. Can be called only when in REJECTED state.
   virtual RejectionReason rejection_reason() const = 0;
 
   // Called in response to incoming message received from the peer.
   // Should only be called when in WAITING_MESSAGE state. Caller retains
   // ownership of |message|. |resume_callback| will be called when processing is
   // finished. The implementation must guarantee that |resume_callback| is not
@@ skipping 31 matching lines @@
   virtual scoped_ptr<Authenticator> CreateAuthenticator(
       const std::string& local_jid,
       const std::string& remote_jid,
       const buzz::XmlElement* first_message) = 0;
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_AUTHENTICATOR_H_