Revert 261566 "device/bluetooth: Rename device::bluetooth_utils:..."

trunk/src/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 161 matching lines @@
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceMac::Forget(const ErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceMac::ConnectToService(
-    const device::BluetoothUUID& service_uuid,
+    const std::string& service_uuid,
     const SocketCallback& callback) {
   IOBluetoothSDPServiceRecord* record =
-      [device_ getServiceRecordForUUID:GetIOBluetoothSDPUUID(
-          service_uuid.canonical_value())];
+      [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(
@@ skipping 13 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceMac::ClearOutOfBandPairingData(
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace device