bluetooth: Shutdown BluetoothAdapter before DBus on ChromeOS.

device/bluetooth/bluetooth_adapter.cc

 // Copyright (c) 2012 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.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 
 namespace device {
 
 BluetoothAdapter::ServiceOptions::ServiceOptions() {
 }
 BluetoothAdapter::ServiceOptions::~ServiceOptions() {
 }
 
 #if !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_MACOSX)
 //static
 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter(
     const InitCallback& init_callback) {
   return base::WeakPtr<BluetoothAdapter>();
 }
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_MACOSX)
 
+#if defined(OS_CHROMEOS)
+void BluetoothAdapter::OnDBusThreadManagerShutdown() {
+  NOTIMPLEMENTED();
+}
+#endif

[armansito, 2015/01/14 23:49:47]

Remove

[scheib, 2015/01/15 00:03:40]

Done.

+
 BluetoothAdapter::BluetoothAdapter()
     : weak_ptr_factory_(this) {
 }
 
 BluetoothAdapter::~BluetoothAdapter() {
   STLDeleteValues(&devices_);
 }
 
 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::GetWeakPtrForTesting() {
   return weak_ptr_factory_.GetWeakPtr();
@@ skipping 106 matching lines @@
   }
 }
 
 void BluetoothAdapter::DiscoverySessionBecameInactive(
     BluetoothDiscoverySession* discovery_session) {
   DCHECK(!discovery_session->IsActive());
   discovery_sessions_.erase(discovery_session);
 }
 
 }  // namespace device