chrome.bluetooth API improvements.

device/bluetooth/bluetooth_device_chromeos.cc

 // Copyright 2013 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 "device/bluetooth/bluetooth_device_chromeos.h"
 
 #include <stdio.h>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "dbus/bus.h"
 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
 #include "device/bluetooth/bluetooth_pairing_chromeos.h"
 #include "device/bluetooth/bluetooth_profile_chromeos.h"
 #include "device/bluetooth/bluetooth_socket.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using device::BluetoothDevice;
 
 namespace {
 
+const char kNotImplemented[] = "Function not yet implemented";
+
 // Histogram enumerations for pairing results.
 enum UMAPairingResult {
   UMA_PAIRING_RESULT_SUCCESS,
   UMA_PAIRING_RESULT_INPROGRESS,
   UMA_PAIRING_RESULT_FAILED,
   UMA_PAIRING_RESULT_AUTH_FAILED,
   UMA_PAIRING_RESULT_AUTH_CANCELED,
   UMA_PAIRING_RESULT_AUTH_REJECTED,
   UMA_PAIRING_RESULT_AUTH_TIMEOUT,
   UMA_PAIRING_RESULT_UNSUPPORTED_DEVICE,
@@ skipping 182 matching lines @@
           GetProperties(object_path_);
   DCHECK(properties);
 
   return properties->uuids.value();
 }
 
 void BluetoothDeviceChromeOS::GetServiceRecords(
     const ServiceRecordsCallback& callback,
     const ErrorCallback& error_callback) {
   // TODO(keybuk): not implemented; remove
-  error_callback.Run();
+  error_callback.Run(kNotImplemented);

[keybuk, 2014/03/27 20:20:07]

Drop this change, this is using ErrorCallback not ConnectToProfileErrorCallback

[rpaquay, 2014/03/27 22:00:01]

Actually, this method has disappeared after rebasing this CL.

 }
 
 void BluetoothDeviceChromeOS::ProvidesServiceWithName(
     const std::string& name,
     const ProvidesServiceCallback& callback) {
   // TODO(keybuk): not implemented; remove
   callback.Run(false);
 }
 
 bool BluetoothDeviceChromeOS::ExpectingPinCode() const {
@@ skipping 120 matching lines @@
 void BluetoothDeviceChromeOS::ConnectToService(
     const std::string& service_uuid,
     const SocketCallback& callback) {
   // TODO(keybuk): implement
   callback.Run(scoped_refptr<device::BluetoothSocket>());
 }
 
 void BluetoothDeviceChromeOS::ConnectToProfile(
     device::BluetoothProfile* profile,
     const base::Closure& callback,
-    const ErrorCallback& error_callback) {
+    const ConnectToProfileErrorCallback& error_callback) {
   BluetoothProfileChromeOS* profile_chromeos =
       static_cast<BluetoothProfileChromeOS*>(profile);
   VLOG(1) << object_path_.value() << ": Connecting profile: "
           << profile_chromeos->uuid();
   DBusThreadManager::Get()->GetBluetoothDeviceClient()->
       ConnectProfile(
           object_path_,
           profile_chromeos->uuid(),
           base::Bind(
               &BluetoothDeviceChromeOS::OnConnectProfile,
               weak_ptr_factory_.GetWeakPtr(),
               profile,
               callback),
           base::Bind(
               &BluetoothDeviceChromeOS::OnConnectProfileError,
               weak_ptr_factory_.GetWeakPtr(),
               profile,
               error_callback));
 }
 
 void BluetoothDeviceChromeOS::SetOutOfBandPairingData(
     const device::BluetoothOutOfBandPairingData& data,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   // TODO(keybuk): implement
-  error_callback.Run();
+  error_callback.Run(kNotImplemented);

[keybuk, 2014/03/27 20:20:07]

as above

[rpaquay, 2014/03/27 22:00:01]

Done.

 }
 
 void BluetoothDeviceChromeOS::ClearOutOfBandPairingData(
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   // TODO(keybuk): implement
-  error_callback.Run();
+  error_callback.Run(kNotImplemented);

[keybuk, 2014/03/27 20:20:07]

as above

[rpaquay, 2014/03/27 22:00:01]

Done.

 }
 
 BluetoothPairingChromeOS* BluetoothDeviceChromeOS::BeginPairing(
     BluetoothDevice::PairingDelegate* pairing_delegate) {
   pairing_.reset(new BluetoothPairingChromeOS(this, pairing_delegate));
   return pairing_.get();
 }
 
 void BluetoothDeviceChromeOS::EndPairing() {
   pairing_.reset();
@@ skipping 142 matching lines @@
   VLOG(1) << object_path_.value() << ": Disconnected";
   callback.Run();
 }
 
 void BluetoothDeviceChromeOS::OnDisconnectError(
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   LOG(WARNING) << object_path_.value() << ": Failed to disconnect device: "
                << error_name << ": " << error_message;
-  error_callback.Run();
+  error_callback.Run(error_message);

[keybuk, 2014/03/27 20:20:07]

as above

[rpaquay, 2014/03/27 22:00:01]

Done.

 }
 
 void BluetoothDeviceChromeOS::OnForgetError(
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   LOG(WARNING) << object_path_.value() << ": Failed to remove device: "
                << error_name << ": " << error_message;
-  error_callback.Run();
+  error_callback.Run(error_message);

[keybuk, 2014/03/27 20:20:07]

as above

[rpaquay, 2014/03/27 22:00:01]

Done.

 }
 
 void BluetoothDeviceChromeOS::OnConnectProfile(
     device::BluetoothProfile* profile,
     const base::Closure& callback) {
   BluetoothProfileChromeOS* profile_chromeos =
       static_cast<BluetoothProfileChromeOS*>(profile);
   VLOG(1) << object_path_.value() << ": Profile connected: "
           << profile_chromeos->uuid();
   callback.Run();
 }
 
 void BluetoothDeviceChromeOS::OnConnectProfileError(
     device::BluetoothProfile* profile,
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   BluetoothProfileChromeOS* profile_chromeos =
       static_cast<BluetoothProfileChromeOS*>(profile);
   VLOG(1) << object_path_.value() << ": Profile connection failed: "
           << profile_chromeos->uuid() << ": "
           << error_name << ": " << error_message;
-  error_callback.Run();
+  error_callback.Run(error_message);
 }
 
 }  // namespace chromeos