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

trunk/src/device/bluetooth/bluetooth_profile_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_profile_mac.h"
 
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothSDPServiceRecord.h>
 #import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
 
@@ skipping 28 matching lines @@
   DCHECK(uuid_bytes_vector.size() == 16);
 
   return [IOBluetoothSDPUUID uuidWithBytes:&uuid_bytes_vector[0]
                                     length:uuid_bytes_vector.size()];
 }
 
 }  // namespace
 
 namespace device {
 
-BluetoothProfileMac::BluetoothProfileMac(const BluetoothUUID& uuid,
+BluetoothProfileMac::BluetoothProfileMac(const std::string& uuid,
                                          const std::string& name)
     : BluetoothProfile(), uuid_(uuid), name_(name) {
 }
 
 BluetoothProfileMac::~BluetoothProfileMac() {
 }
 
 void BluetoothProfileMac::Unregister() {
   delete this;
 }
 
 void BluetoothProfileMac::SetConnectionCallback(
     const ConnectionCallback& callback) {
   connection_callback_ = callback;
 }
 
 bool BluetoothProfileMac::Connect(IOBluetoothDevice* device) {
   if (connection_callback_.is_null())
     return false;
 
   IOBluetoothSDPServiceRecord* record =
-      [device getServiceRecordForUUID:GetIOBluetoothSDPUUID(
-          uuid_.canonical_value())];
+      [device getServiceRecordForUUID:GetIOBluetoothSDPUUID(uuid_)];
   if (record != nil) {
     scoped_refptr<BluetoothSocket> socket(
         BluetoothSocketMac::CreateBluetoothSocket(record));
     if (socket.get() != NULL) {
       BluetoothDeviceMac device_mac(device);
       connection_callback_.Run(&device_mac, socket);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace device