Revert of [Merge to M50] Enable bootstrapping feature by default.

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 82 matching lines @@
 BluetoothHostPairingController::BluetoothHostPairingController()
     : current_stage_(STAGE_NONE),
       connectivity_status_(CONNECTIVITY_UNTESTED),
       update_status_(UPDATE_STATUS_UNKNOWN),
       enrollment_status_(ENROLLMENT_STATUS_UNKNOWN),
       proto_decoder_(new ProtoDecoder(this)),
       ptr_factory_(this) {}
 
 BluetoothHostPairingController::~BluetoothHostPairingController() {
   Reset();
+  if (adapter_.get()) {
+    if (adapter_->IsDiscoverable()) {
+      adapter_->SetDiscoverable(false, base::Closure(), base::Closure());
+    }
+    adapter_->RemoveObserver(this);
+    adapter_ = NULL;
+  }
 }
 
 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 32 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::Bind(&base::DoNothing),
-                                base::Bind(&base::DoNothing));
-    }
-    if (!was_powered_) {
-      adapter_->SetPowered(false, base::Bind(&base::DoNothing),
-                           base::Bind(&base::DoNothing));
-    }
-    adapter_->RemoveObserver(this);
-    adapter_ = NULL;
-  }
   ChangeStage(STAGE_NONE);
 }
 
 void BluetoothHostPairingController::OnGetAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!adapter_.get());
   adapter_ = adapter;
 
   if (adapter_->IsPresent()) {
@@ skipping 15 matching lines @@
       device_name_,
       base::Bind(&BluetoothHostPairingController::OnSetName,
                  ptr_factory_.GetWeakPtr()),
       base::Bind(&BluetoothHostPairingController::OnSetError,
                  ptr_factory_.GetWeakPtr()));
 }
 
 void BluetoothHostPairingController::OnSetName() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (adapter_->IsPowered()) {
-    was_powered_ = true;
     OnSetPowered();
   } else {
     adapter_->SetPowered(
         true,
         base::Bind(&BluetoothHostPairingController::OnSetPowered,
                    ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothHostPairingController::OnSetError,
                    ptr_factory_.GetWeakPtr()));
   }
 }
@@ skipping 296 matching lines @@
   ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION);
 }
 
 void BluetoothHostPairingController::AuthorizePairing(
     device::BluetoothDevice* device) {
   // Disallow unknown device.
   device->RejectPairing();
 }
 
 }  // namespace pairing_chromeos