| Index: extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
|
| diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
|
| index e9997e9df87ac237203b4be25fe6500058183b60..4a95082c4aebea8686f91fb1fbf1633c102f9551 100644
|
| --- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
|
| +++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
|
| @@ -268,7 +268,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetServices) {
|
|
|
| EXPECT_CALL(*mock_adapter_, GetDevice(_))
|
| .Times(3)
|
| - .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothDevice*>(nullptr)))
|
| .WillRepeatedly(Return(device0_.get()));
|
|
|
| EXPECT_CALL(*device0_, GetGattServices())
|
| @@ -296,12 +296,12 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetService) {
|
|
|
| EXPECT_CALL(*mock_adapter_, GetDevice(_))
|
| .Times(3)
|
| - .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothDevice*>(nullptr)))
|
| .WillRepeatedly(Return(device0_.get()));
|
|
|
| EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
|
| .Times(2)
|
| - .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattService*>(nullptr)))
|
| .WillOnce(Return(service0_.get()));
|
|
|
| // Load and wait for setup.
|
| @@ -456,7 +456,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetCharacteristics) {
|
| Return(device0_.get()));
|
| EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
|
| .Times(3)
|
| - .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattService*>(nullptr)))
|
| .WillRepeatedly(Return(service0_.get()));
|
| EXPECT_CALL(*service0_, GetCharacteristics())
|
| .Times(2)
|
| @@ -485,17 +485,17 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetCharacteristic) {
|
|
|
| EXPECT_CALL(*mock_adapter_, GetDevice(_))
|
| .Times(4)
|
| - .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothDevice*>(nullptr)))
|
| .WillRepeatedly(Return(device0_.get()));
|
|
|
| EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
|
| .Times(3)
|
| - .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattService*>(nullptr)))
|
| .WillRepeatedly(Return(service0_.get()));
|
|
|
| EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
|
| .Times(2)
|
| - .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(nullptr)))
|
| .WillOnce(Return(chrc0_.get()));
|
|
|
| // Load the extension and wait for first test.
|
| @@ -788,7 +788,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetDescriptors) {
|
| .WillRepeatedly(Return(service0_.get()));
|
| EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
|
| .Times(3)
|
| - .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(nullptr)))
|
| .WillRepeatedly(Return(chrc0_.get()));
|
| EXPECT_CALL(*chrc0_, GetDescriptors())
|
| .Times(2)
|
| @@ -820,22 +820,22 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetDescriptor) {
|
|
|
| EXPECT_CALL(*mock_adapter_, GetDevice(_))
|
| .Times(5)
|
| - .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothDevice*>(nullptr)))
|
| .WillRepeatedly(Return(device0_.get()));
|
|
|
| EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
|
| .Times(4)
|
| - .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattService*>(nullptr)))
|
| .WillRepeatedly(Return(service0_.get()));
|
|
|
| EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
|
| .Times(3)
|
| - .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(nullptr)))
|
| .WillRepeatedly(Return(chrc0_.get()));
|
|
|
| EXPECT_CALL(*chrc0_, GetDescriptor(kTestDescriptorId0))
|
| .Times(2)
|
| - .WillOnce(Return(static_cast<BluetoothGattDescriptor*>(NULL)))
|
| + .WillOnce(Return(static_cast<BluetoothGattDescriptor*>(nullptr)))
|
| .WillOnce(Return(desc0_.get()));
|
|
|
| // Load the extension and wait for first test.
|
| @@ -1109,7 +1109,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GattConnection) {
|
| catcher.RestrictToBrowserContext(browser()->profile());
|
|
|
| EXPECT_CALL(*mock_adapter_, GetDevice(_))
|
| - .WillRepeatedly(Return(static_cast<BluetoothDevice*>(NULL)));
|
| + .WillRepeatedly(Return(static_cast<BluetoothDevice*>(nullptr)));
|
| EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress0))
|
| .WillRepeatedly(Return(device0_.get()));
|
| EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress1))
|
|
|