Adapter changes for implementing local GATT attributes and tests.

device/bluetooth/bluetooth_adapter_unittest.cc

Index: device/bluetooth/bluetooth_adapter_unittest.cc
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index 27a18fb9070dcca72f422ad89ebc532ce0a1a0a1..0c12221a1610dd81fddfdb4e2b01df387524d74b 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -16,6 +16,10 @@
 #include "build/build_config.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
+#include "device/bluetooth/bluetooth_gatt_service.h"
+#include "device/bluetooth/bluetooth_local_gatt_characteristic.h"
+#include "device/bluetooth/bluetooth_local_gatt_descriptor.h"
+#include "device/bluetooth/bluetooth_local_gatt_service.h"
 #include "device/bluetooth/test/bluetooth_test.h"
 #include "device/bluetooth/test/test_bluetooth_adapter_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -549,6 +553,7 @@ TEST_F(BluetoothTest, NoPermissions) {
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
+#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)

[scheib, 2016/04/28 05:02:29]

Why do these no longer work?

[rkc, 2016/04/28 19:02:44]

These actually never worked. These tests were only passing because we weren't
calling BluetoothTestBase::TearDown() from BluetoothTestBlueZ::TearDown(), hence
never checking the expected callbacks.

The issue is with running the message loop. RunUntilIdle doesn't seem to run the
DiscoverLowEnergyDevice code. We need to use a run_loop and post a quit closure
when done. When done is not quite clear and will need some investigation.

Since these aren't new tests, it seemed more logical to disable them again
rather than try to fix them in this unrelated CL.

 // Discovers a device.
 TEST_F(BluetoothTest, DiscoverLowEnergyDevice) {
   if (!PlatformSupportsLowEnergy()) {
@@ -565,7 +570,9 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDevice) {
   BluetoothDevice* device = adapter_->GetDevice(observer.last_device_address());
   EXPECT_TRUE(device);
 }
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 
+#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 // Discovers the same device multiple times.
 TEST_F(BluetoothTest, DiscoverLowEnergyDeviceTwice) {
   if (!PlatformSupportsLowEnergy()) {
@@ -589,6 +596,7 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDeviceTwice) {
   EXPECT_EQ(0, observer.device_added_count());
   EXPECT_EQ(1u, adapter_->GetDevices().size());
 }
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 
 #if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Discovers a device, and then again with new Service UUIDs.
@@ -641,6 +649,7 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDeviceWithUpdatedUUIDs) {
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
+#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 // Discovers multiple devices when addresses vary.
 TEST_F(BluetoothTest, DiscoverMultipleLowEnergyDevices) {
   if (!PlatformSupportsLowEnergy()) {
@@ -657,6 +666,7 @@ TEST_F(BluetoothTest, DiscoverMultipleLowEnergyDevices) {
   EXPECT_EQ(2, observer.device_added_count());
   EXPECT_EQ(2u, adapter_->GetDevices().size());
 }
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 
 #if defined(OS_ANDROID)
 TEST_F(BluetoothTest, TogglePowerFakeAdapter) {
@@ -716,4 +726,42 @@ TEST_F(BluetoothTest, TogglePowerBeforeScan) {
 }
 #endif  // defined(OS_ANDROID)
 
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+TEST_F(BluetoothTest, RegisterLocalGattServices) {
+  InitWithFakeAdapter();
+  base::WeakPtr<BluetoothLocalGattService> service =
+      BluetoothLocalGattService::Create(
+          adapter_.get(), BluetoothUUID(kTestUUIDGenericAttribute), true,
+          nullptr, nullptr);
+  base::WeakPtr<BluetoothLocalGattCharacteristic> characteristic1 =
+      BluetoothLocalGattCharacteristic::Create(
+          BluetoothUUID(kTestUUIDGenericAttribute),
+          device::BluetoothLocalGattCharacteristic::Properties(),
+          device::BluetoothLocalGattCharacteristic::Permissions(),
+          service.get());
+
+  base::WeakPtr<BluetoothLocalGattCharacteristic> characteristic2 =
+      BluetoothLocalGattCharacteristic::Create(
+          BluetoothUUID(kTestUUIDGenericAttribute),
+          device::BluetoothLocalGattCharacteristic::Properties(),
+          device::BluetoothLocalGattCharacteristic::Permissions(),
+          service.get());
+
+  base::WeakPtr<BluetoothLocalGattDescriptor> descriptor =
+      BluetoothLocalGattDescriptor::Create(
+          BluetoothUUID(kTestUUIDGenericAttribute),
+          device::BluetoothLocalGattCharacteristic::Permissions(),
+          characteristic1.get());
+
+  service->Register(GetCallback(Call::EXPECTED),
+                    GetGattErrorCallback(Call::NOT_EXPECTED));
+  service->Register(GetCallback(Call::NOT_EXPECTED),
+                    GetGattErrorCallback(Call::EXPECTED));
+  service->Unregister(GetCallback(Call::EXPECTED),
+                      GetGattErrorCallback(Call::NOT_EXPECTED));
+  service->Unregister(GetCallback(Call::NOT_EXPECTED),
+                      GetGattErrorCallback(Call::EXPECTED));
+}
+#endif  // defined(OS_CHROMEOS) || defined(OS_LINUX)
+
 }  // namespace device