Simplify AuthenticationMethod type and PIN hash handling.

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"
@@ skipping 10 matching lines @@
 
 const buzz::StaticQName NegotiatingAuthenticatorBase::kMethodAttributeQName =
     { "", "method" };
 const buzz::StaticQName
 NegotiatingAuthenticatorBase::kSupportedMethodsAttributeQName =
     { "", "supported-methods" };
 const char NegotiatingAuthenticatorBase::kSupportedMethodsSeparator = ',';
 
 NegotiatingAuthenticatorBase::NegotiatingAuthenticatorBase(
     Authenticator::State initial_state)
-    : current_method_(AuthenticationMethod::Invalid()),
-      state_(initial_state),
-      rejection_reason_(INVALID_CREDENTIALS) {
-}
+    : state_(initial_state) {}
 
-NegotiatingAuthenticatorBase::~NegotiatingAuthenticatorBase() {
-}
+NegotiatingAuthenticatorBase::~NegotiatingAuthenticatorBase() {}
 
 Authenticator::State NegotiatingAuthenticatorBase::state() const {
   return state_;
 }
 
 bool NegotiatingAuthenticatorBase::started() const {
   if (!current_authenticator_) {
     return false;
   }
   return current_authenticator_->started();
@@ skipping 28 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_.is_valid());
+  DCHECK(current_method_ != AuthenticationMethod::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, current_method_.ToString());
+  result->AddAttr(kMethodAttributeQName,
+                  AuthenticationMethodToString(current_method_));
   return result;
 }
 
-void NegotiatingAuthenticatorBase::AddMethod(
-    const AuthenticationMethod& method) {
-  DCHECK(method.is_valid());
+void NegotiatingAuthenticatorBase::AddMethod(AuthenticationMethod method) {
+  DCHECK(method != AuthenticationMethod::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