Wait for the Bluetooth adapter to be present before starting pairing.

components/pairing/bluetooth_host_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_host_pairing_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "components/pairing/bluetooth_pairing_constants.h"
 #include "components/pairing/pairing_api.pb.h"
 #include "components/pairing/proto_decoder.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "net/base/io_buffer.h"
 
 namespace {
 const int kReceiveSize = 16384;
 }
 
 namespace pairing_chromeos {
 
 BluetoothHostPairingController::BluetoothHostPairingController()
     : current_stage_(STAGE_NONE),
       device_(NULL),
       proto_decoder_(new ProtoDecoder(this)),
       ptr_factory_(this) {
 }
 
 BluetoothHostPairingController::~BluetoothHostPairingController() {}

[Nikita (slow), 2014/09/16 21:54:56]

Remove observer on dtor?

[Zachary Kuznia, 2014/09/16 22:06:37]

Done.

 
 void BluetoothHostPairingController::ChangeStage(Stage new_stage) {
   if (current_stage_ == new_stage)
     return;
   current_stage_ = new_stage;
   FOR_EACH_OBSERVER(Observer, observers_, PairingStageChanged(new_stage));
 }
 
 void BluetoothHostPairingController::SendHostStatus() {
   pairing_api::HostStatus host_status;
@@ skipping 59 matching lines @@
   }
   ChangeStage(STAGE_NONE);
 }
 
 void BluetoothHostPairingController::OnGetAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!adapter_);
   adapter_ = adapter;
 
+  if (adapter_->IsPresent()) {
+    SetName();
+  } else {
+    // Set the name once the adapter is present.
+    adapter_->AddObserver(this);
+  }
+}
+
+void BluetoothHostPairingController::SetName() {
   // TODO(zork): Make the device name prettier. (http://crbug.com/405774)
   device_name_ = base::StringPrintf("%s%s", kDeviceNamePrefix,
                                     adapter_->GetAddress().c_str());
+
   adapter_->SetName(
       device_name_,
       base::Bind(&BluetoothHostPairingController::OnSetName,
                  ptr_factory_.GetWeakPtr()),
       base::Bind(&BluetoothHostPairingController::OnSetError,
                  ptr_factory_.GetWeakPtr()));
 }
 
 void BluetoothHostPairingController::OnSetName() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 169 matching lines @@
 
   // TODO(zork): Handle adding another controller. (http://crbug.com/405757)
   ChangeStage(STAGE_FINISHED);
 }
 
 void BluetoothHostPairingController::OnErrorMessage(
     const pairing_api::Error& message) {
   NOTREACHED();
 }
 
+void BluetoothHostPairingController::AdapterPresentChanged(
+    device::BluetoothAdapter* adapter,
+    bool present) {
+  DCHECK_EQ(adapter, adapter_.get());
+  if (present) {
+    adapter_->RemoveObserver(this);
+    SetName();
+  }
+}
+
 void BluetoothHostPairingController::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void BluetoothHostPairingController::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 HostPairingController::Stage BluetoothHostPairingController::GetCurrentStage() {
   return current_stage_;
@@ skipping 71 matching lines @@
   ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION);
 }
 
 void BluetoothHostPairingController::AuthorizePairing(
     device::BluetoothDevice* device) {
   // Disallow unknown device.
   device->RejectPairing();
 }
 
 }  // namespace pairing_chromeos