diff --git a/content/browser/bluetooth/web_bluetooth_service_impl.cc b/content/browser/bluetooth/web_bluetooth_service_impl.cc index 05f1ebad27304..2bacdc9e8d2a4 100644 --- a/content/browser/bluetooth/web_bluetooth_service_impl.cc +++ b/content/browser/bluetooth/web_bluetooth_service_impl.cc @@ -204,7 +204,7 @@ void WebBluetoothServiceImpl::AdapterPresentChanged( void WebBluetoothServiceImpl::DeviceChanged(device::BluetoothAdapter* adapter, device::BluetoothDevice* device) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (!device->IsGattConnected() || !device->IsConnected()) { + if (!device->IsGattConnected()) { std::string device_id = connected_devices_->CloseConnectionToDeviceWithAddress( device->GetAddress()); diff --git a/device/bluetooth/bluez/bluetooth_device_bluez.cc b/device/bluetooth/bluez/bluetooth_device_bluez.cc index 9ed6bf1cc4005..713c14f0f2665 100644 --- a/device/bluetooth/bluez/bluetooth_device_bluez.cc +++ b/device/bluetooth/bluez/bluetooth_device_bluez.cc @@ -288,8 +288,9 @@ bool BluetoothDeviceBlueZ::IsConnected() const { } bool BluetoothDeviceBlueZ::IsGattConnected() const { - NOTIMPLEMENTED(); - return false; + // Bluez uses the same attribute for GATT Connections and Classic BT + // Connections. + return IsConnected(); } bool BluetoothDeviceBlueZ::IsConnectable() const { diff --git a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc index 1c1c110f5ec61..c5fa376674e42 100644 --- a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc +++ b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc @@ -205,6 +205,7 @@ TEST_F(BluetoothGattBlueZTest, GattConnection) { adapter_->GetDevice(bluez::FakeBluetoothDeviceClient::kLowEnergyAddress); ASSERT_TRUE(device); ASSERT_FALSE(device->IsConnected()); + ASSERT_FALSE(device->IsGattConnected()); ASSERT_FALSE(gatt_conn_.get()); ASSERT_EQ(0, success_callback_count_); ASSERT_EQ(0, error_callback_count_); @@ -218,6 +219,7 @@ TEST_F(BluetoothGattBlueZTest, GattConnection) { EXPECT_EQ(1, success_callback_count_); EXPECT_EQ(0, error_callback_count_); EXPECT_TRUE(device->IsConnected()); + EXPECT_TRUE(device->IsGattConnected()); ASSERT_TRUE(gatt_conn_.get()); EXPECT_TRUE(gatt_conn_->IsConnected()); EXPECT_EQ(bluez::FakeBluetoothDeviceClient::kLowEnergyAddress, @@ -225,6 +227,7 @@ TEST_F(BluetoothGattBlueZTest, GattConnection) { gatt_conn_->Disconnect(); EXPECT_FALSE(device->IsConnected()); + EXPECT_FALSE(device->IsGattConnected()); EXPECT_FALSE(gatt_conn_->IsConnected()); device->CreateGattConnection( @@ -236,6 +239,7 @@ TEST_F(BluetoothGattBlueZTest, GattConnection) { EXPECT_EQ(2, success_callback_count_); EXPECT_EQ(0, error_callback_count_); EXPECT_TRUE(device->IsConnected()); + EXPECT_TRUE(device->IsGattConnected()); ASSERT_TRUE(gatt_conn_.get()); EXPECT_TRUE(gatt_conn_->IsConnected()); @@ -247,6 +251,7 @@ TEST_F(BluetoothGattBlueZTest, GattConnection) { EXPECT_EQ(3, success_callback_count_); EXPECT_EQ(0, error_callback_count_); EXPECT_FALSE(device->IsConnected()); + EXPECT_FALSE(device->IsGattConnected()); ASSERT_TRUE(gatt_conn_.get()); EXPECT_FALSE(gatt_conn_->IsConnected()); @@ -259,6 +264,7 @@ TEST_F(BluetoothGattBlueZTest, GattConnection) { EXPECT_EQ(4, success_callback_count_); EXPECT_EQ(0, error_callback_count_); EXPECT_TRUE(device->IsConnected()); + EXPECT_TRUE(device->IsGattConnected()); EXPECT_TRUE(gatt_conn_->IsConnected()); fake_bluetooth_device_client_->RemoveDevice(