bluetooth: Browser side partial implementation of getPrimaryService.

content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

Index: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
diff --git a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
index f3516e718318924f4d0ad74d0954a62aa9e293cc..3c3dda085ed562654e58879c000ca5d54eca2361 100644
--- a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
+++ b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
@@ -18,11 +18,13 @@ using device::BluetoothAdapterFactory;
 using device::BluetoothDevice;
 using device::BluetoothDiscoverySession;
 using device::BluetoothGattConnection;
+using device::BluetoothGattService;
 using device::BluetoothUUID;
 using device::MockBluetoothAdapter;
 using device::MockBluetoothDevice;
 using device::MockBluetoothDiscoverySession;
 using device::MockBluetoothGattConnection;
+using device::MockBluetoothGattService;
 using testing::Between;
 using testing::Invoke;
 using testing::Return;
@@ -171,6 +173,20 @@ LayoutTestBluetoothAdapterProvider::GetEmptyDevice(
   list.push_back(BluetoothUUID("1800"));
   list.push_back(BluetoothUUID("1801"));
   ON_CALL(*empty_device, GetUUIDs()).WillByDefault(Return(list));
+
+  empty_device->AddMockService(
+      GetMockService(empty_device.get(), "1800" /* Generic Access */));
+  empty_device->AddMockService(
+      GetMockService(empty_device.get(), "1801" /* Generic Attribute */));
+
+  // Using Invoke allows the device returned from this method to be futher
+  // modified and have more services added to it. The call to ::GetGattServices
+  // will invoke ::GetMockServices, returning all services added up to that
+  // time.
+  ON_CALL(*empty_device, GetGattServices())

[scheib, 2015/05/28 23:09:16]

This can stay on the empty device, just move the AddMockService calls to a non
EmptyDevice.

[ortuno, 2015/05/29 17:53:55]

See comment in bluetooth_adapter_provider.h

+      .WillByDefault(
+          Invoke(empty_device.get(), &MockBluetoothDevice::GetMockServices));
+
   return empty_device.Pass();
 }
 
@@ -205,4 +221,13 @@ LayoutTestBluetoothAdapterProvider::GetUnconnectableDevice(
   return device.Pass();
 }
 
+// static
+scoped_ptr<NiceMock<MockBluetoothGattService>>
+LayoutTestBluetoothAdapterProvider::GetMockService(MockBluetoothDevice* device,
+                                                   const std::string& uuid) {
+  return make_scoped_ptr(new NiceMock<MockBluetoothGattService>(
+      device, uuid /* identifier */, BluetoothUUID(uuid), true /* is_primary */,
+      false /* is_local */));
+}
+
 }  // namespace content