Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8450)

Unified Diff: device/bluetooth/bluetooth_adapter_profile_chromeos.cc

Issue 935383003: Fix BluetoothAdapterProfileChromeOS lifecycle management (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: further fix ownership, address comments Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_adapter_profile_chromeos.cc
diff --git a/device/bluetooth/bluetooth_adapter_profile_chromeos.cc b/device/bluetooth/bluetooth_adapter_profile_chromeos.cc
index 2feff37aed352abdbf8c54b8f42ecd096f465639..9fbb4b8ae936363b073da06895251fe203dfb856 100644
--- a/device/bluetooth/bluetooth_adapter_profile_chromeos.cc
+++ b/device/bluetooth/bluetooth_adapter_profile_chromeos.cc
@@ -20,15 +20,12 @@ namespace chromeos {
// static
BluetoothAdapterProfileChromeOS* BluetoothAdapterProfileChromeOS::Register(
- BluetoothAdapterChromeOS* adapter,
const device::BluetoothUUID& uuid,
const BluetoothProfileManagerClient::Options& options,
const base::Closure& success_callback,
const BluetoothProfileManagerClient::ErrorCallback& error_callback) {
- DCHECK(adapter);
-
BluetoothAdapterProfileChromeOS* profile =
- new BluetoothAdapterProfileChromeOS(adapter, uuid);
+ new BluetoothAdapterProfileChromeOS(uuid);
VLOG(1) << "Registering profile: " << profile->object_path().value();
DBusThreadManager::Get()->GetBluetoothProfileManagerClient()->RegisterProfile(
@@ -39,9 +36,8 @@ BluetoothAdapterProfileChromeOS* BluetoothAdapterProfileChromeOS::Register(
}
BluetoothAdapterProfileChromeOS::BluetoothAdapterProfileChromeOS(
- BluetoothAdapterChromeOS* adapter,
const device::BluetoothUUID& uuid)
- : uuid_(uuid), adapter_(adapter), weak_ptr_factory_(this) {
+ : uuid_(uuid), weak_ptr_factory_(this) {
std::string uuid_path;
base::ReplaceChars(uuid.canonical_value(), ":-", "_", &uuid_path);
object_path_ =
@@ -54,7 +50,6 @@ BluetoothAdapterProfileChromeOS::BluetoothAdapterProfileChromeOS(
}
BluetoothAdapterProfileChromeOS::~BluetoothAdapterProfileChromeOS() {
- profile_.reset();
}
bool BluetoothAdapterProfileChromeOS::SetDelegate(

Powered by Google App Engine
This is Rietveld 408576698