API change to allow sticker authentication for devices

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 91 matching lines @@
   ticket_request_->Start(ticket_request.Pass());
 }
 
 #if defined(ENABLE_WIFI_BOOTSTRAPPING)
 void PrivetV3SetupFlow::SetupWifiAndRegister(const std::string& device_ssid) {
   NOTIMPLEMENTED();
 }
 #endif  // ENABLE_WIFI_BOOTSTRAPPING
 
 void PrivetV3SetupFlow::OnSetupConfirmationNeeded(
-    const std::string& confirmation_code) {
+    const std::string& confirmation_code,
+    extensions::api::gcd_private::ConfirmationType confirmation_type) {
   delegate_->ConfirmSecurityCode(confirmation_code,
                                  base::Bind(&PrivetV3SetupFlow::OnCodeConfirmed,
-                                            weak_ptr_factory_.GetWeakPtr()));
+                                            weak_ptr_factory_.GetWeakPtr(),
+                                            confirmation_code));
 }
 
-void PrivetV3SetupFlow::OnSessionEstablished() {
-  DCHECK(setup_request_);
-  session_->StartRequest(setup_request_.get());
-}
-
-void PrivetV3SetupFlow::OnCannotEstablishSession() {
-  OnSetupError();
+void PrivetV3SetupFlow::OnSessionStatus(
+    extensions::api::gcd_private::Status status) {
+  if (status == extensions::api::gcd_private::STATUS_SUCCESS) {
+    DCHECK(setup_request_);
+    session_->StartRequest(setup_request_.get());
+  } else {
+    OnSetupError();
+  }
 }
 
 void PrivetV3SetupFlow::OnSetupError() {
   delegate_->OnSetupError();
 }
 
 void PrivetV3SetupFlow::OnDeviceRegistered() {
   delegate_->OnSetupDone();
 }
 
@@ skipping 17 matching lines @@
 void PrivetV3SetupFlow::OnPrivetClientCreated(
     scoped_ptr<PrivetHTTPClient> privet_http_client) {
   if (!privet_http_client) {
     OnSetupError();
     return;
   }
   session_.reset(new PrivetV3Session(privet_http_client.Pass(), this));
   session_->Start();
 }
 
-void PrivetV3SetupFlow::OnCodeConfirmed(bool success) {
+void PrivetV3SetupFlow::OnCodeConfirmed(const std::string& code, bool success) {
   if (!success)
     return OnSetupError();
-  session_->ConfirmCode();
+  session_->ConfirmCode(code);
 }
 
 }  // namespace local_discovery