Handle pairing_client_id in the negotiating authenticators.

remoting/protocol/pairing_authenticator_base.cc

Index: remoting/protocol/pairing_authenticator_base.cc
diff --git a/remoting/protocol/pairing_authenticator_base.cc b/remoting/protocol/pairing_authenticator_base.cc
index 3f9bcfa9374e1ee4c1eca90eedf8568501fa7c4a..4adc6ee4aa2a64a9624170781726fc7df1f2a19f 100644
--- a/remoting/protocol/pairing_authenticator_base.cc
+++ b/remoting/protocol/pairing_authenticator_base.cc
@@ -13,11 +13,6 @@
 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" };
@@ -82,7 +77,6 @@ void PairingAuthenticatorBase::ProcessMessage(
 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;
 }