Fix update and enrollment flow

components/pairing/bluetooth_controller_pairing_controller.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 "components/pairing/bluetooth_controller_pairing_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/pairing/bluetooth_pairing_constants.h"
 #include "components/pairing/pairing_api.pb.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "net/base/io_buffer.h"
 
 namespace {
 const int kReceiveSize = 16384;
 }
 
 namespace pairing_chromeos {
 
 BluetoothControllerPairingController::BluetoothControllerPairingController()
     : current_stage_(STAGE_NONE),
-      got_initial_status_(false),
       proto_decoder_(new ProtoDecoder(this)),
       ptr_factory_(this) {
 }
 
 BluetoothControllerPairingController::~BluetoothControllerPairingController() {
   Reset();
 }
 
 device::BluetoothDevice* BluetoothControllerPairingController::GetController() {
   DCHECK(!controller_device_id_.empty());
   device::BluetoothDevice* device = adapter_->GetDevice(controller_device_id_);
   if (!device) {
     LOG(ERROR) << "Lost connection to controller.";
     ChangeStage(STAGE_ESTABLISHING_CONNECTION_ERROR);
   }
 
   return device;
 }
 
 void BluetoothControllerPairingController::ChangeStage(Stage new_stage) {
   if (current_stage_ == new_stage)
     return;
   VLOG(1) << "ChangeStage " << new_stage;
   current_stage_ = new_stage;
   FOR_EACH_OBSERVER(ControllerPairingController::Observer, observers_,
                     PairingStageChanged(new_stage));
 }
 
 void BluetoothControllerPairingController::Reset() {
-  got_initial_status_ = false;
   controller_device_id_.clear();
   discovery_session_.reset();
 
   if (socket_.get()) {
     socket_->Close();
     socket_ = NULL;
   }
 
   if (adapter_.get()) {
     adapter_->RemoveObserver(this);
@@ skipping 282 matching lines @@
   ChangeStage(STAGE_HOST_ENROLLMENT_IN_PROGRESS);
 }
 
 void BluetoothControllerPairingController::StartSession() {
   DCHECK_EQ(current_stage_, STAGE_PAIRING_DONE);
   ChangeStage(STAGE_FINISHED);
 }
 
 void BluetoothControllerPairingController::OnHostStatusMessage(
     const pairing_api::HostStatus& message) {
-  if (got_initial_status_) {
-    // TODO(zork): Check that the domain matches. (http://crbug.com/405761)
-    // TODO(zork): Handling updating stages (http://crbug.com/405754).
-    pairing_api::CompleteSetup complete_setup;
-    complete_setup.set_api_version(kPairingAPIVersion);
-    // TODO(zork): Get AddAnother from UI (http://crbug.com/405757)
-    complete_setup.mutable_parameters()->set_add_another(false);
-
-    int size = 0;
-    scoped_refptr<net::IOBuffer> io_buffer(
-        ProtoDecoder::SendCompleteSetup(complete_setup, &size));
-
-    SendBuffer(io_buffer, size);
-    ChangeStage(STAGE_PAIRING_DONE);
-  } else {
-    got_initial_status_ = true;
-
-    // TODO(zork): Check domain. (http://crbug.com/405761)
-    // TODO(achuith): Need STAGE_HOST_UPDATE_IN_PROGRESS here.
+  pairing_api::HostStatusParameters::UpdateStatus update_status =
+      message.parameters().update_status();
+  pairing_api::HostStatusParameters::EnrollmentStatus enrollment_status =
+      message.parameters().enrollment_status();
+  VLOG(1) << "OnHostStatusMessage, update_status=" << update_status;
+  // TODO(zork): Check domain. (http://crbug.com/405761)
+  if (enrollment_status ==
+      pairing_api::HostStatusParameters::ENROLLMENT_STATUS_SUCCESS) {
+    // TODO(achuith, zork): Need to ensure that controller has also successfully
+    // enrolled.
+    CompleteSetup();
+  } else if (update_status ==
+      pairing_api::HostStatusParameters::UPDATE_STATUS_UPDATING) {
+    ChangeStage(STAGE_HOST_UPDATE_IN_PROGRESS);
+  } else if (update_status ==
+      pairing_api::HostStatusParameters::UPDATE_STATUS_UPDATED) {
     ChangeStage(STAGE_WAITING_FOR_CREDENTIALS);
   }
 }
 
+void BluetoothControllerPairingController::CompleteSetup() {
+  pairing_api::CompleteSetup complete_setup;
+  complete_setup.set_api_version(kPairingAPIVersion);
+  // TODO(zork): Get AddAnother from UI (http://crbug.com/405757)
+  complete_setup.mutable_parameters()->set_add_another(false);
+
+  int size = 0;
+  scoped_refptr<net::IOBuffer> io_buffer(
+      ProtoDecoder::SendCompleteSetup(complete_setup, &size));
+
+  SendBuffer(io_buffer, size);
+  ChangeStage(STAGE_PAIRING_DONE);
+}
+
 void BluetoothControllerPairingController::OnConfigureHostMessage(
     const pairing_api::ConfigureHost& message) {
   NOTREACHED();
 }
 
 void BluetoothControllerPairingController::OnPairDevicesMessage(
     const pairing_api::PairDevices& message) {
   NOTREACHED();
 }
 
@@ skipping 63 matching lines @@
   ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION);
 }
 
 void BluetoothControllerPairingController::AuthorizePairing(
     device::BluetoothDevice* device) {
   // Disallow unknown device.
   device->RejectPairing();
 }
 
 }  // namespace pairing_chromeos