Fixes to DBus GATT components.

device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h

 // Copyright 2014 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_FAKE_BLUETOOTH_GATT_MANAGER_CLIENT_H_
 #define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_GATT_MANAGER_CLIENT_H_
 
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 22 matching lines @@
 class DEVICE_BLUETOOTH_EXPORT FakeBluetoothGattManagerClient
     : public BluetoothGattManagerClient {
  public:
   FakeBluetoothGattManagerClient();
   ~FakeBluetoothGattManagerClient() override;
 
   // DBusClient override.
   void Init(dbus::Bus* bus) override;
 
   // BluetoothGattManagerClient overrides.
-  void RegisterApplication(const dbus::ObjectPath& application_path,
+  void RegisterApplication(const dbus::ObjectPath& adapter_object_path,
+                           const dbus::ObjectPath& application_path,
                            const Options& options,
                            const base::Closure& callback,
                            const ErrorCallback& error_callback) override;
-  void UnregisterApplication(const dbus::ObjectPath& application_path,
+  void UnregisterApplication(const dbus::ObjectPath& adapter_object_path,
+                             const dbus::ObjectPath& application_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback) override;
 
   // Register, unregister, and retrieve pointers to application service
   // providers. Automatically called from the application provider constructor
   // and destructors.
   void RegisterApplicationServiceProvider(
       FakeBluetoothGattApplicationServiceProvider* provider);
   void RegisterServiceServiceProvider(
       FakeBluetoothGattServiceServiceProvider* provider);
@@ skipping 63 matching lines @@
   ServiceMap service_map_;
   CharacteristicMap characteristic_map_;
   DescriptorMap descriptor_map_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeBluetoothGattManagerClient);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_GATT_MANAGER_CLIENT_H_