Fixes to DBus GATT components.

device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_APPLICATION_SERVICE_PROVIDER_IMPL_H_
 #define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_APPLICATION_SERVICE_PROVIDER_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
 
  private:
   friend class BluetoothGattApplicationServiceProviderTest;
   FRIEND_TEST_ALL_PREFIXES(BluetoothGattApplicationServiceProviderTest,
                            GetManagedObjects);
 
   // Returns true if the current thread is on the origin thread.
   bool OnOriginThread();
 
   template <typename Attribute>
-  void WriteObjectStruct(dbus::MessageWriter* writer,
-                         const std::string& attribute_interface,
-                         Attribute* attribute);
+  void WriteObjectDict(dbus::MessageWriter* writer,
+                       const std::string& attribute_interface,
+                       Attribute* attribute);
   template <typename Attribute>
-  void WriteInterfaceStruct(dbus::MessageWriter* writer,
-                            const std::string& attribute_interface,
-                            Attribute* attribute);
+  void WriteInterfaceDict(dbus::MessageWriter* writer,
+                          const std::string& attribute_interface,
+                          Attribute* attribute);
 
   void WriteAttributeProperties(
       dbus::MessageWriter* writer,
       BluetoothGattServiceServiceProvider* service_provider);
   void WriteAttributeProperties(
       dbus::MessageWriter* writer,
       BluetoothGattCharacteristicServiceProvider* characteristic_provider);
   void WriteAttributeProperties(
       dbus::MessageWriter* writer,
       BluetoothGattDescriptorServiceProvider* descriptor_provider);
@@ skipping 39 matching lines @@
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothGattApplicationServiceProviderImpl>
       weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattApplicationServiceProviderImpl);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_APPLICATION_SERVICE_PROVIDER_IMPL_H_