Added pairing with Spake SHA224 key exchange.

chrome/browser/local_discovery/privetv3_setup_flow.cc

 // Copyright 2014 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 "chrome/browser/local_discovery/privetv3_setup_flow.h"
 
 #include "base/logging.h"
 #include "chrome/browser/local_discovery/gcd_registration_ticket_request.h"
 
 namespace local_discovery {
@@ skipping 68 matching lines @@
 void PrivetV3SetupFlow::OnCodeConfirmed(bool success) {
   if (!success)
     return OnSetupError();
   session_->ConfirmCode("1234", base::Bind(&PrivetV3SetupFlow::OnPairingDone,
                                            weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PrivetV3SetupFlow::OnSessionInitialized(
     PrivetV3Session::Result result,
     const std::vector<PrivetV3Session::PairingType>& types) {
-  if (result != PrivetV3Session::Result::STATUS_SUCCESS)
+  if (result != PrivetV3Session::Result::STATUS_SUCCESS ||
+      !std::count(types.begin(), types.end(),
+                  PrivetV3Session::PairingType::PAIRING_TYPE_EMBEDDEDCODE)) {

[Aleksey Shlyapnikov, 2015/01/26 21:47:45]

std::count will iterate over all elements, use std::find.

     return OnSetupError();
-  session_->StartPairing(PrivetV3Session::PairingType::PAIRING_TYPE_PINCODE,
-                         base::Bind(&PrivetV3SetupFlow::OnPairingStarted,
-                                    weak_ptr_factory_.GetWeakPtr()));
+  }
+  session_->StartPairing(
+      PrivetV3Session::PairingType::PAIRING_TYPE_EMBEDDEDCODE,
+      base::Bind(&PrivetV3SetupFlow::OnPairingStarted,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PrivetV3SetupFlow::OnPairingStarted(PrivetV3Session::Result result) {
   if (result != PrivetV3Session::Result::STATUS_SUCCESS)
     return OnSetupError();
   delegate_->ConfirmSecurityCode(base::Bind(&PrivetV3SetupFlow::OnCodeConfirmed,
                                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PrivetV3SetupFlow::OnPairingDone(PrivetV3Session::Result result) {
   if (result != PrivetV3Session::Result::STATUS_SUCCESS)
     return OnSetupError();
   base::DictionaryValue message;
   message.SetString(kTicketJsonKeyName, ticket_id_);
   message.SetString(kUserJsonKeyName, "me");
   session_->SendMessage("/privet/v3/setup/start", message,
                         base::Bind(&PrivetV3SetupFlow::OnSetupMessageSent,
                                    weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PrivetV3SetupFlow::OnSetupMessageSent(
     PrivetV3Session::Result result,
     const base::DictionaryValue& response) {
   if (result != PrivetV3Session::Result::STATUS_SUCCESS)
     return OnSetupError();
   delegate_->OnSetupDone();
 }
 
 }  // namespace local_discovery