Cleanup AuthenticatorMethod usage.

remoting/protocol/negotiating_authenticator_base.cc

 // 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.
 
 #include "remoting/protocol/negotiating_authenticator_base.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/channel_authenticator.h"
+#include "remoting/protocol/name_value_map.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
+namespace {
+
+const NameMapElement<NegotiatingAuthenticatorBase::Method>
+    kAuthenticationMethodStrings[] = {
+        {NegotiatingAuthenticatorBase::Method::SPAKE2_SHARED_SECRET_PLAIN,
+         "spake2_plain"},
+        {NegotiatingAuthenticatorBase::Method::SPAKE2_SHARED_SECRET_HMAC,
+         "spake2_hmac"},
+        {NegotiatingAuthenticatorBase::Method::SPAKE2_PAIR, "spake2_pair"},
+        {NegotiatingAuthenticatorBase::Method::THIRD_PARTY, "third_party"},
+};
+
+}  // namespace
+
 const buzz::StaticQName NegotiatingAuthenticatorBase::kMethodAttributeQName =
     { "", "method" };
 const buzz::StaticQName
 NegotiatingAuthenticatorBase::kSupportedMethodsAttributeQName =
     { "", "supported-methods" };
 const char NegotiatingAuthenticatorBase::kSupportedMethodsSeparator = ',';
 
 NegotiatingAuthenticatorBase::NegotiatingAuthenticatorBase(
     Authenticator::State initial_state)
     : state_(initial_state) {}
 
 NegotiatingAuthenticatorBase::~NegotiatingAuthenticatorBase() {}
 
 Authenticator::State NegotiatingAuthenticatorBase::state() const {
   return state_;
 }
 
 bool NegotiatingAuthenticatorBase::started() const {
   if (!current_authenticator_) {
     return false;
   }
   return current_authenticator_->started();
 }
 
 Authenticator::RejectionReason
 NegotiatingAuthenticatorBase::rejection_reason() const {
   return rejection_reason_;
 }
 
+// static
+NegotiatingAuthenticatorBase::Method
+NegotiatingAuthenticatorBase::ParseMethodString(const std::string& value) {
+  Method result;
+  if (!NameToValue(kAuthenticationMethodStrings, value, &result))
+    return Method::INVALID;
+  return result;
+}
+
+// static
+std::string NegotiatingAuthenticatorBase::MethodToString(Method method) {
+  return ValueToName(kAuthenticationMethodStrings, method);
+}
+
 void NegotiatingAuthenticatorBase::ProcessMessageInternal(
     const buzz::XmlElement* message,
     const base::Closure& resume_callback) {
   if (current_authenticator_->state() == WAITING_MESSAGE) {
     // If the message was not discarded and the authenticator is waiting for it,
     // give it to the underlying authenticator to process.
     // |current_authenticator_| is owned, so Unretained() is safe here.
     state_ = PROCESSING_MESSAGE;
     current_authenticator_->ProcessMessage(message, base::Bind(
         &NegotiatingAuthenticatorBase::UpdateState,
@@ skipping 11 matching lines @@
   // |resume_callback| to resume the session negotiation.
   state_ = current_authenticator_->state();
   if (state_ == REJECTED)
     rejection_reason_ = current_authenticator_->rejection_reason();
   resume_callback.Run();
 }
 
 scoped_ptr<buzz::XmlElement>
 NegotiatingAuthenticatorBase::GetNextMessageInternal() {
   DCHECK_EQ(state(), MESSAGE_READY);
-  DCHECK(current_method_ != AuthenticationMethod::INVALID);
+  DCHECK(current_method_ != Method::INVALID);
 
   scoped_ptr<buzz::XmlElement> result;
   if (current_authenticator_->state() == MESSAGE_READY) {
     result = current_authenticator_->GetNextMessage();
   } else {
     result = CreateEmptyAuthenticatorMessage();
   }
   state_ = current_authenticator_->state();
   DCHECK(state_ == ACCEPTED || state_ == WAITING_MESSAGE);
-  result->AddAttr(kMethodAttributeQName,
-                  AuthenticationMethodToString(current_method_));
+  result->AddAttr(kMethodAttributeQName, MethodToString(current_method_));
   return result;
 }
 
-void NegotiatingAuthenticatorBase::AddMethod(AuthenticationMethod method) {
-  DCHECK(method != AuthenticationMethod::INVALID);
+void NegotiatingAuthenticatorBase::AddMethod(Method method) {
+  DCHECK(method != Method::INVALID);
   methods_.push_back(method);
 }
 
 const std::string& NegotiatingAuthenticatorBase::GetAuthKey() const {
   DCHECK_EQ(state(), ACCEPTED);
   return current_authenticator_->GetAuthKey();
 }
 
 scoped_ptr<ChannelAuthenticator>
 NegotiatingAuthenticatorBase::CreateChannelAuthenticator() const {
   DCHECK_EQ(state(), ACCEPTED);
   return current_authenticator_->CreateChannelAuthenticator();
 }
 
 }  // namespace protocol
 }  // namespace remoting