chrome.bluetooth API improvements.

device/bluetooth/bluetooth_device_mac.mm

 // 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_mac.h"
 
 #include <IOBluetooth/Bluetooth.h>
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothSDPServiceRecord.h>
 #import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
@@ skipping 18 matching lines @@
 - (NSString*)addressString;
 - (NSString*)name;
 - (unsigned int)classOfDevice;
 - (NSArray*)services;
 @end
 
 #endif  // MAC_OS_X_VERSION_10_7
 
 namespace {
 
+const char kFailedToConnect[] = "Connection failed";
+
 // Converts |uuid| to a IOBluetoothSDPUUID instance.
 //
 // |uuid| must be in the format of XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX.
 IOBluetoothSDPUUID* GetIOBluetoothSDPUUID(const std::string& uuid) {
   DCHECK(uuid.size() == 36);
   DCHECK(uuid[8] == '-');
   DCHECK(uuid[13] == '-');
   DCHECK(uuid[18] == '-');
   DCHECK(uuid[23] == '-');
   std::string numbers_only = uuid;
@@ skipping 158 matching lines @@
       [device_ getServiceRecordForUUID:GetIOBluetoothSDPUUID(service_uuid)];
   if (record != nil) {
     BluetoothServiceRecordMac service_record(record);
     scoped_refptr<BluetoothSocket> socket(
         BluetoothSocketMac::CreateBluetoothSocket(service_record));
     if (socket.get() != NULL)
       callback.Run(socket);
   }
 }
 
-void BluetoothDeviceMac::ConnectToProfile(
-    device::BluetoothProfile* profile,
-    const base::Closure& callback,
-    const ErrorCallback& error_callback) {
+void BluetoothDeviceMac::ConnectToProfile(BluetoothProfile* profile,
+                                          const base::Closure& callback,
+                                          const ErrorCallback& error_callback) {
   if (static_cast<BluetoothProfileMac*>(profile)->Connect(device_))
     callback.Run();
   else
-    error_callback.Run();
+    error_callback.Run(kFailedToConnect);
 }
 
 void BluetoothDeviceMac::SetOutOfBandPairingData(
     const BluetoothOutOfBandPairingData& data,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceMac::ClearOutOfBandPairingData(
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace device