Simplify AuthenticationMethod type and PIN hash handling.

remoting/client/jni/chromoting_jni_instance.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/client/jni/chromoting_jni_instance.h"
 
 #include <android/log.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 63 matching lines @@
   xmpp_config_.auth_token = auth_token;
 
   // Initialize |authenticator_|.
   scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
       token_fetcher(new TokenFetcherProxy(
           base::Bind(&ChromotingJniInstance::FetchThirdPartyToken,
                      weak_factory_.GetWeakPtr()),
           host_pubkey));
 
   std::vector<protocol::AuthenticationMethod> auth_methods;
-  auth_methods.push_back(protocol::AuthenticationMethod::Spake2Pair());
-  auth_methods.push_back(protocol::AuthenticationMethod::Spake2(
-      protocol::AuthenticationMethod::HMAC_SHA256));
-  auth_methods.push_back(protocol::AuthenticationMethod::Spake2(
-      protocol::AuthenticationMethod::NONE));
-  auth_methods.push_back(protocol::AuthenticationMethod::ThirdParty());
+  auth_methods.push_back(protocol::AuthenticationMethod::THIRD_PARTY);
+  auth_methods.push_back(protocol::AuthenticationMethod::SPAKE2_PAIR);
+  auth_methods.push_back(
+      protocol::AuthenticationMethod::SPAKE2_SHARED_SECRET_HMAC);
+  auth_methods.push_back(
+      protocol::AuthenticationMethod::SPAKE2_SHARED_SECRET_PLAIN);
 
   authenticator_.reset(new protocol::NegotiatingClientAuthenticator(
       pairing_id, pairing_secret, host_id_,
       base::Bind(&ChromotingJniInstance::FetchSecret, this),
       std::move(token_fetcher), auth_methods));
 
   // Post a task to start connection
   jni_runtime_->network_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ChromotingJniInstance::ConnectToHostOnNetworkThread, this));
@@ skipping 418 matching lines @@
       perf_tracker_->round_trip_ms());
 
   client_status_logger_->LogStatistics(perf_tracker_.get());
 
   jni_runtime_->network_task_runner()->PostDelayedTask(
       FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this),
       base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs));
 }
 
 }  // namespace remoting