Handle pairing_client_id in the negotiating authenticators.

remoting/protocol/pairing_authenticator_base.cc

 // 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.
 
 #include "remoting/protocol/pairing_authenticator_base.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/channel_authenticator.h"
 
 namespace remoting {
 namespace protocol {
 
-const buzz::StaticQName PairingAuthenticatorBase::kPairingInfoTag =
-    { kChromotingXmlNamespace, "pairing-info" };
-const buzz::StaticQName PairingAuthenticatorBase::kClientIdAttribute =
-    { "", "client-id" };
-
 namespace {
 const buzz::StaticQName kPairingFailedTag =
     { kChromotingXmlNamespace, "pairing-failed" };
 const buzz::StaticQName kPairingErrorAttribute = { "", "error" };
 }  // namespace
 
 PairingAuthenticatorBase::PairingAuthenticatorBase() : weak_factory_(this) {}
 PairingAuthenticatorBase::~PairingAuthenticatorBase() {}
 
 Authenticator::State PairingAuthenticatorBase::state() const {
@@ skipping 44 matching lines @@
   // to the peer and retrying with the PIN.
   spake2_authenticator_->ProcessMessage(
       message,
       base::Bind(&PairingAuthenticatorBase::CheckForFailedSpakeExchange,
                  weak_factory_.GetWeakPtr(), resume_callback));
 }
 
 scoped_ptr<buzz::XmlElement> PairingAuthenticatorBase::GetNextMessage() {
   DCHECK_EQ(state(), MESSAGE_READY);
   scoped_ptr<buzz::XmlElement> result = spake2_authenticator_->GetNextMessage();
-  AddPairingElements(result.get());
   MaybeAddErrorMessage(result.get());
   return result;
 }
 
 const std::string& PairingAuthenticatorBase::GetAuthKey() const {
   return spake2_authenticator_->GetAuthKey();
 }
 
 scoped_ptr<ChannelAuthenticator>
 PairingAuthenticatorBase::CreateChannelAuthenticator() const {
@@ skipping 34 matching lines @@
     spake2_authenticator_.reset();
     CreateSpakeAuthenticatorWithPin(MESSAGE_READY, resume_callback);
     return;
   }
 
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting