device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h - Issue 1228863002: Runtime checks so that CoreBluetooth only used on >= 10.10

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h

Issue 1228863002: Runtime checks so that CoreBluetooth only used on >= 10.10 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@timeinfo

Patch Set: CHECK->DCHECK Created 5 years, 5 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

« no previous file with comments | « device/bluetooth/bluetooth_low_energy_device_mac.mm ('k') | device/bluetooth/bluetooth_low_energy_discovery_manager_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h

diff --git a/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h b/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h

index c3f707c7fd2c15603296537cb1ae46d5cbf08703..84b2cfe024f136373b34ae5d51d568c7bb9258b7 100644

--- a/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h

+++ b/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h

@@ -81,13 +81,6 @@ class BluetoothLowEnergyDiscoveryManagerMac {

Observer* observer_;

// Underlying CoreBluetooth central manager.

- //

- // Note: Intentionally leaked. Deallocating CBCentralManager

- // results in a crash, at least when running OSX 10.9.5 on a

- // mac_chromuim_rel_ng trybot. On the other hand, restricting |manager_| use

- // to 10.10 and later would mean the code is unrun and untested by the current

- // trybots. To work around this we call retain on |manager_| after allocation,

- // so that the object is leaked.

base::scoped_nsobject<CBCentralManager> manager_;

// Discovery has been initiated by calling the API StartDiscovery().