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

Unified Diff: device/bluetooth/test/bluetooth_test_mac.mm

Issue 2906883004: bluetooth: macOS: Removing useless |.get()| (Closed)
Patch Set: Merge from top of tree Created 3 years, 7 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/test/bluetooth_test_mac.mm
diff --git a/device/bluetooth/test/bluetooth_test_mac.mm b/device/bluetooth/test/bluetooth_test_mac.mm
index 3c5e80001c7b5c742196c9bfe073785f673d75eb..5f16078f45873c5519900e13709adfa6084943ea 100644
--- a/device/bluetooth/test/bluetooth_test_mac.mm
+++ b/device/bluetooth/test/bluetooth_test_mac.mm
@@ -38,7 +38,7 @@ class BluetoothTestMac::ScopedMockCentralManager {
}
// Returns MockCentralManager instance.
- MockCentralManager* get() { return mock_central_manager_.get(); };
+ MockCentralManager* get() { return mock_central_manager_; };
private:
scoped_nsobject<MockCentralManager> mock_central_manager_;
@@ -235,10 +235,10 @@ BluetoothDevice* BluetoothTestMac::SimulateLowEnergyDevice(int device_ordinal) {
scoped_nsobject<MockCBPeripheral> mock_peripheral([[MockCBPeripheral alloc]
initWithUTF8StringIdentifier:identifier
name:name]);
- mock_peripheral.get().bluetoothTestMac = this;
+ [mock_peripheral setBluetoothTestMac:this];
[central_manager_delegate
centralManager:central_manager
- didDiscoverPeripheral:mock_peripheral.get().peripheral
+ didDiscoverPeripheral:[mock_peripheral peripheral]
advertisementData:CreateAdvertisementData(name, uuids, service_data,
tx_power)
RSSI:rssi];
@@ -276,14 +276,14 @@ void BluetoothTestMac::SimulateConnectedLowEnergyDevice(
}
DCHECK(name);
DCHECK(identifier);
- DCHECK([cbUUIDs.get() count] > 0);
+ DCHECK([cbUUIDs count] > 0);
scoped_nsobject<MockCBPeripheral> mock_peripheral([[MockCBPeripheral alloc]
initWithUTF8StringIdentifier:identifier
name:name]);
- mock_peripheral.get().bluetoothTestMac = this;
+ [mock_peripheral setBluetoothTestMac:this];
[mock_central_manager_->get()
- setConnectedMockPeripheral:mock_peripheral.get().peripheral
- withServiceUUIDs:cbUUIDs.get()];
+ setConnectedMockPeripheral:[mock_peripheral peripheral]
+ withServiceUUIDs:cbUUIDs];
}
void BluetoothTestMac::SimulateGattConnectionError(
« no previous file with comments | « device/bluetooth/bluetooth_remote_gatt_service_mac.mm ('k') | device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698