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

trunk/src/device/bluetooth/bluetooth_service_record_win.cc

 // Copyright (c) 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_win.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "device/bluetooth/bluetooth_init_win.h"
-#include "device/bluetooth/bluetooth_uuid.h"
+#include "device/bluetooth/bluetooth_utils.h"
 
 namespace {
 
 const uint16 kProtocolDescriptorListId = 4;
 const uint16 kRfcommUuid = 3;
 const uint16 kUuidId = 1;
 
 bool AdvanceToSdpType(const SDP_ELEMENT_DATA& sequence_data,
                       SDP_TYPE type,
                       HBLUETOOTH_CONTAINER_ELEMENT* element,
@@ skipping 30 matching lines @@
                          SDP_TYPE_UINT,
                          &inner_sequence_element,
                          &inner_sequence_data) &&
         inner_sequence_data.specificType == SDP_ST_UINT8) {
       *rfcomm_channel = inner_sequence_data.data.uint8;
       *supports_rfcomm = true;
     }
   }
 }
 
-void ExtractUuid(const SDP_ELEMENT_DATA& uuid_data,
-                 device::BluetoothUUID* uuid) {
+void ExtractUuid(const SDP_ELEMENT_DATA& uuid_data, std::string* uuid) {
   HBLUETOOTH_CONTAINER_ELEMENT inner_uuid_element = NULL;
   SDP_ELEMENT_DATA inner_uuid_data;
   if (AdvanceToSdpType(uuid_data,
                        SDP_TYPE_UUID,
                        &inner_uuid_element,
                        &inner_uuid_data)) {
     if (inner_uuid_data.specificType == SDP_ST_UUID16) {
       std::string uuid_hex =
           base::StringPrintf("%04x", inner_uuid_data.data.uuid16);
-      *uuid = device::BluetoothUUID(uuid_hex);
+      *uuid = device::bluetooth_utils::CanonicalUuid(uuid_hex);
     } else if (inner_uuid_data.specificType == SDP_ST_UUID32) {
       std::string uuid_hex =
           base::StringPrintf("%08x", inner_uuid_data.data.uuid32);
-      *uuid = device::BluetoothUUID(uuid_hex);
+      *uuid = device::bluetooth_utils::CanonicalUuid(uuid_hex);
     } else if (inner_uuid_data.specificType == SDP_ST_UUID128) {
-      *uuid = device::BluetoothUUID(base::StringPrintf(
+      *uuid = base::StringPrintf(
           "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
           inner_uuid_data.data.uuid128.Data1,
           inner_uuid_data.data.uuid128.Data2,
           inner_uuid_data.data.uuid128.Data3,
           inner_uuid_data.data.uuid128.Data4[0],
           inner_uuid_data.data.uuid128.Data4[1],
           inner_uuid_data.data.uuid128.Data4[2],
           inner_uuid_data.data.uuid128.Data4[3],
           inner_uuid_data.data.uuid128.Data4[4],
           inner_uuid_data.data.uuid128.Data4[5],
           inner_uuid_data.data.uuid128.Data4[6],
-          inner_uuid_data.data.uuid128.Data4[7]));
+          inner_uuid_data.data.uuid128.Data4[7]);
     } else {
-      *uuid = device::BluetoothUUID();
+      uuid->clear();
     }
   }
 }
 
 BTH_ADDR ConvertToBthAddr(const std::string& address) {
   BTH_ADDR bth_addr = 0;
   std::string numbers_only;
   for (int i = 0; i < 6; ++i) {
     numbers_only += address.substr(i * 3, 2);
   }
@@ skipping 31 matching lines @@
     ExtractChannels(protocol_descriptor_list_data,
                     &supports_rfcomm_,
                     &rfcomm_channel_);
   }
   SDP_ELEMENT_DATA uuid_data;
   if (ERROR_SUCCESS == BluetoothSdpGetAttributeValue(
       blob_data,
       blob_size,
       kUuidId,
       &uuid_data)) {
-    ExtractUuid(uuid_data, &uuid_);
+  ExtractUuid(uuid_data, &uuid_);
   }
 }
 
-}  // namespace device
+}  // namespace device