Fixes to DBus GATT components.

device/bluetooth/dbus/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_BLUETOOTH_GATT_MANAGER_CLIENT_H_
 #define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 27 matching lines @@
   // D-Bus object path |service_path| with the remote GATT manager. The local
   // service must implement the GattService1 interface. Characteristic objects
   // must be hierarchical to their service and must use the interface
   // GattCharacteristic1. Similarly, characteristic descriptor objects must
   // implement the GattDescriptor1 interface and must be hierarchical to their
   // characteristic. In a successful invocation of RegisterService, the
   // Bluetooth daemon will discover all objects in the registered hierarchy by
   // using D-Bus Object Manager. Hence, the object paths and the interfaces in
   // the registered hierarchy must comply with the BlueZ GATT D-Bus
   // specification.
-  virtual void RegisterApplication(const dbus::ObjectPath& application_path,
+  virtual void RegisterApplication(const dbus::ObjectPath& adapter_object_path,
+                                   const dbus::ObjectPath& application_path,
                                    const Options& options,
                                    const base::Closure& callback,
                                    const ErrorCallback& error_callback) = 0;
 
   // Unregisters the GATT service with the D-Bus object path |service_path| from
   // the remote GATT manager.
-  virtual void UnregisterApplication(const dbus::ObjectPath& application_path,
-                                     const base::Closure& callback,
-                                     const ErrorCallback& error_callback) = 0;
+  virtual void UnregisterApplication(
+      const dbus::ObjectPath& adapter_object_path,
+      const dbus::ObjectPath& application_path,
+      const base::Closure& callback,
+      const ErrorCallback& error_callback) = 0;
 
   // Creates the instance.
   static BluetoothGattManagerClient* Create();
 
   // Constants used to indicate exceptional error conditions.
   static const char kNoResponseError[];
 
  protected:
   BluetoothGattManagerClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattManagerClient);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_MANAGER_CLIENT_H_