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

trunk/src/device/bluetooth/bluetooth_service_record_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_service_record_mac.h"
 
 #include <IOBluetooth/Bluetooth.h>
 #import <IOBluetooth/IOBluetoothUtilities.h>
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothSDPDataElement.h>
@@ skipping 48 matching lines @@
 
   supports_rfcomm_ =
       [record getRFCOMMChannelID:&rfcomm_channel_] == kIOReturnSuccess;
 
   const BluetoothSDPServiceAttributeID service_class_id = 1;
 
   IOBluetoothSDPDataElement* service_class_data =
       [record getAttributeDataElement:service_class_id];
   if ([service_class_data getTypeDescriptor] ==
           kBluetoothSDPDataElementTypeDataElementSequence) {
-    std::string uuid_str;
-    ExtractUuid(service_class_data, &uuid_str);
-    uuid_ = BluetoothUUID(uuid_str);
+    ExtractUuid(service_class_data, &uuid_);
   }
 }
 
 BluetoothServiceRecordMac::~BluetoothServiceRecordMac() {
   [device_ release];
 }
 
 }  // namespace device