Simplify AuthenticationMethod type and PIN hash handling.

remoting/protocol/me2me_host_authenticator_factory.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/me2me_host_authenticator_factory.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/strings/string_util.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/negotiating_host_authenticator.h"
 #include "remoting/protocol/rejecting_authenticator.h"
 #include "remoting/protocol/token_validator.h"
 #include "remoting/signaling/jid_util.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
 // static
-scoped_ptr<AuthenticatorFactory>
-Me2MeHostAuthenticatorFactory::CreateWithSharedSecret(
+scoped_ptr<AuthenticatorFactory> Me2MeHostAuthenticatorFactory::CreateWithPin(
     bool use_service_account,
     const std::string& host_owner,
     const std::string& local_cert,
     scoped_refptr<RsaKeyPair> key_pair,
     const std::string& required_client_domain,
-    const SharedSecretHash& shared_secret_hash,
+    const std::string& pin_hash,
     scoped_refptr<PairingRegistry> pairing_registry) {
   scoped_ptr<Me2MeHostAuthenticatorFactory> result(
       new Me2MeHostAuthenticatorFactory());
   result->use_service_account_ = use_service_account;
   result->host_owner_ = host_owner;
   result->local_cert_ = local_cert;
   result->key_pair_ = key_pair;
   result->required_client_domain_ = required_client_domain;
-  result->shared_secret_hash_ = shared_secret_hash;
+  result->pin_hash_ = pin_hash;
   result->pairing_registry_ = pairing_registry;
   return std::move(result);
 }
 
 
 // static
 scoped_ptr<AuthenticatorFactory>
 Me2MeHostAuthenticatorFactory::CreateWithThirdPartyAuth(
     bool use_service_account,
     const std::string& host_owner,
@@ skipping 71 matching lines @@
   }
 
   if (!local_cert_.empty() && key_pair_.get()) {
     if (token_validator_factory_) {
       return NegotiatingHostAuthenticator::CreateWithThirdPartyAuth(
           local_cert_, key_pair_,
           token_validator_factory_->CreateTokenValidator(
               local_jid, remote_jid));
     }
 
-    return NegotiatingHostAuthenticator::CreateWithSharedSecret(
-        local_cert_, key_pair_, shared_secret_hash_.value,
-        shared_secret_hash_.hash_function, pairing_registry_);
+    return NegotiatingHostAuthenticator::CreateWithPin(
+        local_cert_, key_pair_, pin_hash_, pairing_registry_);
   }
 
   return make_scoped_ptr(
       new RejectingAuthenticator(Authenticator::INVALID_CREDENTIALS));
 }
 
 }  // namespace protocol
 }  // namespace remoting