Fixes to DBus GATT components.

device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <base/bind.h>
 #include <base/memory/ptr_util.h>
 #include <dbus/bus.h>
 #include <dbus/message.h>
 #include <dbus/object_path.h>
 #include <device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h>
@@ skipping 12 matching lines @@
 const char kAppObjectPath[] = "/fake/hci0/gatt_application";
 const char kFakeServiceUuid[] = "00000000-0000-0000-0000-010040008000";
 const char kFakeCharacteristicUuid[] = "00000000-0000-0000-0000-010040908000";
 const char kFakeDescriptorUuid[] = "00000000-0000-0000-0000-018390008000";
 
 // This is really ugly, but it really is the best way to verify our message
 // was constructed correctly. This string was generated from the test data
 // and then manually verified to match the expected signature.
 const char kExpectedMessage[] =
     "message_type: MESSAGE_METHOD_RETURN\n"
-    "signature: a(oa(sa{sv}))\n"
+    "signature: a{oa{sa{sv}}}\n"
     "reply_serial: 123\n"
     "\n"
     "array [\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path \"/fake/hci0/gatt_application/service0\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattService1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-010040008000\"\n"
     "          }\n"
     "          dict entry {\n"
+    "            string \"Primary\"\n"
+    "            variant               bool true\n"
+    "          }\n"
+    "          dict entry {\n"
     "            string \"Includes\"\n"
     "            variant               array [\n"
     "              ]\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path \"/fake/hci0/gatt_application/service1\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattService1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-010040008000\"\n"
     "          }\n"
     "          dict entry {\n"
+    "            string \"Primary\"\n"
+    "            variant               bool true\n"
+    "          }\n"
+    "          dict entry {\n"
     "            string \"Includes\"\n"
     "            variant               array [\n"
     "              ]\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path \"/fake/hci0/gatt_application/service0/characteristic0\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattCharacteristic1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-010040908000\"\n"
     "          }\n"
     "          dict entry {\n"
     "            string \"Service\"\n"
     "            variant               object_path "
     "\"/fake/hci0/gatt_application/service0\"\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path \"/fake/hci0/gatt_application/service0/characteristic1\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattCharacteristic1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-010040908000\"\n"
     "          }\n"
     "          dict entry {\n"
     "            string \"Service\"\n"
     "            variant               object_path "
     "\"/fake/hci0/gatt_application/service0\"\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path \"/fake/hci0/gatt_application/service1/characteristic0\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattCharacteristic1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-010040908000\"\n"
     "          }\n"
     "          dict entry {\n"
     "            string \"Service\"\n"
     "            variant               object_path "
     "\"/fake/hci0/gatt_application/service1\"\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path "
     "\"/fake/hci0/gatt_application/service0/characteristic0/descriptor0\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattDescriptor1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-018390008000\"\n"
     "          }\n"
     "          dict entry {\n"
     "            string \"Characteristic\"\n"
     "            variant               object_path "
     "\"/fake/hci0/gatt_application/service0/characteristic0\"\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path "
     "\"/fake/hci0/gatt_application/service0/characteristic1/descriptor1\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattDescriptor1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-018390008000\"\n"
     "          }\n"
     "          dict entry {\n"
     "            string \"Characteristic\"\n"
     "            variant               object_path "
     "\"/fake/hci0/gatt_application/service0/characteristic1\"\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path "
     "\"/fake/hci0/gatt_application/service1/characteristic0/descriptor2\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattDescriptor1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-018390008000\"\n"
     "          }\n"
     "          dict entry {\n"
     "            string \"Characteristic\"\n"
     "            variant               object_path "
     "\"/fake/hci0/gatt_application/service1/characteristic0\"\n"
     "          }\n"
     "        ]\n"
     "      }\n"
     "    ]\n"
     "  }\n"
-    "  struct {\n"
+    "  dict entry {\n"
     "    object_path "
     "\"/fake/hci0/gatt_application/service0/characteristic0/descriptor3\"\n"
     "    array [\n"
-    "      struct {\n"
+    "      dict entry {\n"
     "        string \"org.bluez.GattDescriptor1\"\n"
     "        array [\n"
     "          dict entry {\n"
     "            string \"UUID\"\n"
     "            variant               string "
     "\"00000000-0000-0000-0000-018390008000\"\n"
     "          }\n"
     "          dict entry {\n"
     "            string \"Characteristic\"\n"
     "            variant               object_path "
@@ skipping 15 matching lines @@
 class BluetoothGattApplicationServiceProviderTest : public testing::Test {
  public:
   std::string CreateFakeService(
       dbus::Bus* bus,
       BluetoothGattApplicationServiceProviderImpl* app_provider,
       const std::string& service_path) {
     const std::string& full_service_path =
         std::string(kAppObjectPath) + "/" + service_path;
     app_provider->service_providers_.push_back(
         base::WrapUnique(new BluetoothGattServiceServiceProviderImpl(
-            dbus::ObjectPath(full_service_path), kFakeServiceUuid)));
+            dbus::ObjectPath(full_service_path), kFakeServiceUuid, true)));
     return full_service_path;
   }
 
   std::string CreateFakeCharacteristic(
       dbus::Bus* bus,
       BluetoothGattApplicationServiceProviderImpl* app_provider,
       const std::string& characteristic_path,
       const std::string& service_path) {
     const std::string& full_characteristic_path =
         service_path + "/" + characteristic_path;
@@ skipping 50 matching lines @@
   CreateFakeAttributes(nullptr, app_provider.get());
 
   dbus::MethodCall method_call("com.example.Interface", "SomeMethod");
   // Not setting the serial causes a crash.
   method_call.SetSerial(123);
   app_provider->GetManagedObjects(
       &method_call, base::Bind(&ResponseSenderCallback, kExpectedMessage));
 }
 
 }  // namespace bluez