Clear the bluetooth discoverable bit when OOBE is finished on Remora.

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/hash.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 47 matching lines @@
 BluetoothHostPairingController::BluetoothHostPairingController()
     : current_stage_(STAGE_NONE),
       update_status_(UPDATE_STATUS_UNKNOWN),
       enrollment_status_(ENROLLMENT_STATUS_UNKNOWN),
       device_(NULL),
       proto_decoder_(new ProtoDecoder(this)),
       ptr_factory_(this) {
 }
 
 BluetoothHostPairingController::~BluetoothHostPairingController() {
-  if (adapter_.get())
-    adapter_->RemoveObserver(this);
+  Reset();

[achuithb, 2014/10/27 21:32:34]

This also calls ChangeStage, which calls the observers of this destructed
object, and they may actually perform some action using a deleted pointer.

 }
 
 void BluetoothHostPairingController::ChangeStage(Stage new_stage) {
   if (current_stage_ == new_stage)
     return;
   VLOG(1) << "ChangeStage " << new_stage;
   current_stage_ = new_stage;
   FOR_EACH_OBSERVER(Observer, observers_, PairingStageChanged(new_stage));
 }
 
@@ skipping 54 matching lines @@
 void BluetoothHostPairingController::Reset() {
   if (controller_socket_.get()) {
     controller_socket_->Close();
     controller_socket_ = NULL;
   }
 
   if (service_socket_.get()) {
     service_socket_->Close();
     service_socket_ = NULL;
   }
+
+  if (adapter_.get()) {
+    if (adapter_->IsDiscoverable()) {
+      adapter_->SetDiscoverable(false, base::Closure(), base::Closure());
+    }
+    adapter_->RemoveObserver(this);
+    adapter_ = NULL;
+  }
+
   ChangeStage(STAGE_NONE);

[achuithb, 2014/10/27 21:32:34]

Should we get rid of this?

 }
 
 void BluetoothHostPairingController::OnGetAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!adapter_.get());
   adapter_ = adapter;
 
   if (adapter_->IsPresent()) {
     SetName();
@@ skipping 120 matching lines @@
 }
 
 void BluetoothHostPairingController::OnSetError() {
   adapter_->RemovePairingDelegate(this);
   ChangeStage(STAGE_INITIALIZATION_ERROR);
 }
 
 void BluetoothHostPairingController::OnAcceptError(
     const std::string& error_message) {
   LOG(ERROR) << error_message;
-  Reset();
 }
 
 void BluetoothHostPairingController::OnSendError(
     const std::string& error_message) {
   LOG(ERROR) << error_message;
 }
 
 void BluetoothHostPairingController::OnReceiveError(
     device::BluetoothSocket::ErrorReason reason,
     const std::string& error_message) {
   LOG(ERROR) << reason << ", " << error_message;
-  Reset();
 }
 
 void BluetoothHostPairingController::OnHostStatusMessage(
     const pairing_api::HostStatus& message) {
   NOTREACHED();
 }
 
 void BluetoothHostPairingController::OnConfigureHostMessage(
     const pairing_api::ConfigureHost& message) {
   FOR_EACH_OBSERVER(Observer, observers_,
@@ skipping 147 matching lines @@
   ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION);
 }
 
 void BluetoothHostPairingController::AuthorizePairing(
     device::BluetoothDevice* device) {
   // Disallow unknown device.
   device->RejectPairing();
 }
 
 }  // namespace pairing_chromeos