Simplify AuthenticationMethod type and PIN hash handling.

remoting/client/plugin/chromoting_instance.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/client/plugin/chromoting_instance.h"
 
 #include <nacl_io/nacl_io.h>
 #include <sys/mount.h>
 
 #include <string>
@@ skipping 687 matching lines @@
           protocol::TransportRole::CLIENT));
 
   // Create Authenticator.
   scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
       token_fetcher(new TokenFetcherProxy(
           base::Bind(&ChromotingInstance::FetchThirdPartyToken,
                      weak_factory_.GetWeakPtr()),
           host_public_key));
 
   std::vector<protocol::AuthenticationMethod> auth_methods;
-  auth_methods.push_back(protocol::AuthenticationMethod::ThirdParty());
-  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::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);
 
   scoped_ptr<protocol::Authenticator> authenticator(
       new protocol::NegotiatingClientAuthenticator(
           client_pairing_id, client_paired_secret, authentication_tag,
           fetch_secret_callback, std::move(token_fetcher), auth_methods));
 
   scoped_ptr<protocol::CandidateSessionConfig> config =
       protocol::CandidateSessionConfig::CreateDefault();
   if (std::find(experiments_list.begin(), experiments_list.end(), "vp9") !=
       experiments_list.end()) {
@@ skipping 428 matching lines @@
   if (is_custom_counts_histogram) {
     uma.HistogramCustomCounts(histogram_name, value, histogram_min,
                               histogram_max, histogram_buckets);
   } else {
     uma.HistogramCustomTimes(histogram_name, value, histogram_min,
                              histogram_max, histogram_buckets);
   }
 }
 
 }  // namespace remoting