bluetooth: Shutdown BluetoothAdapter before DBus on ChromeOS.

device/bluetooth/bluetooth_adapter_chromeos.cc

 // Copyright 2013 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 "device/bluetooth/bluetooth_adapter_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 54 matching lines @@
 }
 
 namespace chromeos {
 
 // static
 base::WeakPtr<BluetoothAdapter> BluetoothAdapterChromeOS::CreateAdapter() {
   BluetoothAdapterChromeOS* adapter = new BluetoothAdapterChromeOS();
   return adapter->weak_ptr_factory_.GetWeakPtr();
 }
 
+void BluetoothAdapterChromeOS::Shutdown() {
+  if (is_shutdown_)
+    return;
+  is_shutdown_ = true;

[armansito, 2015/01/14 20:49:04]

Here I would explicitly set present as false or at least notify all observers
with PresentChanged

[scheib, 2015/01/14 23:07:27]

Done: reworked to call RemoveAdapter().

+  DCHECK(DBusThreadManager::IsInitialized())
+      << "Call BluetoothAdapterFactory::Shutdown() before "
+         "DBusThreadManager::Shutdown().";
+  DBusThreadManager::Get()->GetBluetoothAdapterClient()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetBluetoothDeviceClient()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetBluetoothInputClient()->RemoveObserver(this);
+
+  VLOG(1) << "Unregistering pairing agent";
+  DBusThreadManager::Get()->GetBluetoothAgentManagerClient()->UnregisterAgent(
+      dbus::ObjectPath(kAgentPath), base::Bind(&base::DoNothing),
+      base::Bind(&OnUnregisterAgentError));
+
+  agent_.reset();
+  STLDeleteValues(&devices_);
+}
+
 BluetoothAdapterChromeOS::BluetoothAdapterChromeOS()
-    : num_discovery_sessions_(0),
+    : is_shutdown_(false),
+      num_discovery_sessions_(0),
       discovery_request_pending_(false),
       weak_ptr_factory_(this) {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   socket_thread_ = device::BluetoothSocketThread::Get();
 
   DBusThreadManager::Get()->GetBluetoothAdapterClient()->AddObserver(this);
   DBusThreadManager::Get()->GetBluetoothDeviceClient()->AddObserver(this);
   DBusThreadManager::Get()->GetBluetoothInputClient()->AddObserver(this);
 
   // Register the pairing agent.
   dbus::Bus* system_bus = DBusThreadManager::Get()->GetSystemBus();
   agent_.reset(BluetoothAgentServiceProvider::Create(
       system_bus, dbus::ObjectPath(kAgentPath), this));
   DCHECK(agent_.get());
 
   std::vector<dbus::ObjectPath> object_paths =
       DBusThreadManager::Get()->GetBluetoothAdapterClient()->GetAdapters();
 
   if (!object_paths.empty()) {
     VLOG(1) << object_paths.size() << " Bluetooth adapter(s) available.";
     SetAdapter(object_paths[0]);
   }
 }
 
 BluetoothAdapterChromeOS::~BluetoothAdapterChromeOS() {
-  DBusThreadManager::Get()->GetBluetoothAdapterClient()->RemoveObserver(this);
-  DBusThreadManager::Get()->GetBluetoothDeviceClient()->RemoveObserver(this);
-  DBusThreadManager::Get()->GetBluetoothInputClient()->RemoveObserver(this);
-
-  VLOG(1) << "Unregistering pairing agent";
-  DBusThreadManager::Get()->GetBluetoothAgentManagerClient()->
-      UnregisterAgent(
-          dbus::ObjectPath(kAgentPath),
-          base::Bind(&base::DoNothing),
-          base::Bind(&OnUnregisterAgentError));
+  Shutdown();
 }
 
 void BluetoothAdapterChromeOS::DeleteOnCorrectThread() const {
   if (ui_task_runner_->RunsTasksOnCurrentThread() ||
       !ui_task_runner_->DeleteSoon(FROM_HERE, this))
     delete this;
 }
 
 void BluetoothAdapterChromeOS::AddObserver(
     BluetoothAdapter::Observer* observer) {
@@ skipping 46 matching lines @@
                      weak_ptr_factory_.GetWeakPtr(),
                      callback,
                      error_callback));
 }
 
 bool BluetoothAdapterChromeOS::IsInitialized() const {
   return true;
 }
 
 bool BluetoothAdapterChromeOS::IsPresent() const {
-  return !object_path_.value().empty();
+  return !is_shutdown_ && !object_path_.value().empty();
 }
 
 bool BluetoothAdapterChromeOS::IsPowered() const {
   if (!IsPresent())
     return false;
 
   BluetoothAdapterClient::Properties* properties =
       DBusThreadManager::Get()->GetBluetoothAdapterClient()->
           GetProperties(object_path_);
 
@@ skipping 56 matching lines @@
           GetProperties(object_path_);
 
   return properties->discovering.value();
 }
 
 void BluetoothAdapterChromeOS::CreateRfcommService(
     const BluetoothUUID& uuid,
     const ServiceOptions& options,
     const CreateServiceCallback& callback,
     const CreateServiceErrorCallback& error_callback) {
   VLOG(1) << object_path_.value() << ": Creating RFCOMM service: "

[armansito, 2015/01/14 19:52:43]

Add check for IsPresent in all public API functions, here and below.

[scheib, 2015/01/14 23:07:27]

Added a check for dbus_is_shutdown_ added.

A test relies on CreateRfcommService working when IsPresent is false.

https://code.google.com/p/chromium/codesearch#chromium/src/device/bluetooth/b...

           << uuid.canonical_value();
   scoped_refptr<BluetoothSocketChromeOS> socket =
       BluetoothSocketChromeOS::CreateBluetoothSocket(
           ui_task_runner_, socket_thread_);
   socket->Listen(this,
                  BluetoothSocketChromeOS::kRfcomm,
                  uuid,
                  options,
                  base::Bind(callback, socket),
                  error_callback);
@@ skipping 802 matching lines @@
 
     // If the queued request resulted in a pending call, then let it
     // asynchonously process the remaining queued requests once the pending
     // call returns.
     if (discovery_request_pending_)
       return;
   }
 }
 
 }  // namespace chromeos