Handle pairing_client_id in the negotiating authenticators.

remoting/protocol/pairing_authenticator_base.h

 // Copyright 2013 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_PAIRING_AUTHENTICATOR_BASE_H_
 #define REMOTING_PROTOCOL_PAIRING_AUTHENTICATOR_BASE_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "remoting/protocol/authenticator.h"
@@ skipping 35 matching lines @@
   State state() const override;
   bool started() const override;
   RejectionReason rejection_reason() const override;
   void ProcessMessage(const buzz::XmlElement* message,
                       const base::Closure& resume_callback) override;
   scoped_ptr<buzz::XmlElement> GetNextMessage() override;
   const std::string& GetAuthKey() const override;
   scoped_ptr<ChannelAuthenticator> CreateChannelAuthenticator() const override;
 
  protected:
-  static const buzz::StaticQName kPairingInfoTag;
-  static const buzz::StaticQName kClientIdAttribute;
-
   // Create a Spake2 authenticator in the specified state, prompting the user
   // for the PIN first if necessary.
   virtual void CreateSpakeAuthenticatorWithPin(
       State initial_state,
       const base::Closure& resume_callback) = 0;
 
-  // Amend an authenticator message, for example to add client- or host-specific
-  // elements to it.
-  virtual void AddPairingElements(buzz::XmlElement* message) = 0;
-
   // A non-fatal error message that derived classes should set in order to
   // cause the peer to be notified that pairing has failed and that it should
   // fall back on PIN authentication. This string need not be human-readable,
   // nor is it currently used other than being logged.
   std::string error_message_;
 
   // The underlying SPAKE2 authenticator, created with either the PIN or the
   // Paired Secret by the derived class.
   scoped_ptr<Authenticator> spake2_authenticator_;
 
   // Derived classes must set this to True if the underlying authenticator is
   // using the Paired Secret.
   bool using_paired_secret_ = false;
 
  private:
-  // Helper methods for ProcessMessage and GetNextMessage
+  // Helper methods for ProcessMessage() and GetNextMessage().
   void MaybeAddErrorMessage(buzz::XmlElement* message);
   bool HasErrorMessage(const buzz::XmlElement* message) const;
   void CheckForFailedSpakeExchange(const base::Closure& resume_callback);
 
   base::WeakPtrFactory<PairingAuthenticatorBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PairingAuthenticatorBase);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PAIRING_AUTHENTICATOR_H_