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

trunk/src/device/bluetooth/bluetooth_device_win.cc

Index: trunk/src/device/bluetooth/bluetooth_device_win.cc
===================================================================
--- trunk/src/device/bluetooth/bluetooth_device_win.cc	(revision 261569)
+++ trunk/src/device/bluetooth/bluetooth_device_win.cc	(working copy)
@@ -161,7 +161,7 @@
 }
 
 void BluetoothDeviceWin::ConnectToService(
-    const device::BluetoothUUID& service_uuid,
+    const std::string& service_uuid,
     const SocketCallback& callback) {
   for (ServiceRecordList::const_iterator iter = service_record_list_.begin();
        iter != service_record_list_.end();
@@ -202,11 +202,11 @@
 }
 
 const BluetoothServiceRecord* BluetoothDeviceWin::GetServiceRecord(
-    const device::BluetoothUUID& uuid) const {
+    const std::string& uuid) const {
   for (ServiceRecordList::const_iterator iter = service_record_list_.begin();
        iter != service_record_list_.end();
        ++iter) {
-    if ((*iter)->uuid() == uuid)
+    if ((*iter)->uuid().compare(uuid) == 0)
       return *iter;
   }
   return NULL;