device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID

device/bluetooth/bluetooth_utils.cc

Index: device/bluetooth/bluetooth_utils.cc
diff --git a/device/bluetooth/bluetooth_utils.cc b/device/bluetooth/bluetooth_utils.cc
index b8747365d6add606394deacfd95ed2c9ced24b41..129bcec98aa61cfd812e054aa3453d824f2951e6 100644
--- a/device/bluetooth/bluetooth_utils.cc
+++ b/device/bluetooth/bluetooth_utils.cc
@@ -4,106 +4,16 @@
 
 #include "device/bluetooth/bluetooth_utils.h"
 
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/strings/string_util.h"
+#include "device/bluetooth/bluetooth_uuid.h"
 
 namespace device {
 namespace bluetooth_utils {
 
-namespace {
-
-const char* kCommonUuidPostfix = "-0000-1000-8000-00805f9b34fb";
-const char* kCommonUuidPrefix = "0000";
-const int kUuidSize = 36;
-
-// Returns the canonical, 128-bit canonical, and the format of the UUID
-// in |canonical|, |canonical_128|, and |format| based on |uuid|.
-void GetCanonicalUuid(std::string uuid,
-                      std::string* canonical,
-                      std::string* canonical_128,
-                      UUID::Format* format) {
-  // Initialize the values for the failure case.
-  canonical->clear();
-  canonical_128->clear();
-  *format = UUID::kFormatInvalid;
-
-  if (uuid.empty())
-    return;
-
-  if (uuid.size() < 11 && uuid.find("0x") == 0)
-    uuid = uuid.substr(2);
-
-  if (!(uuid.size() == 4 || uuid.size() == 8 || uuid.size() == 36))
-    return;
-
-  if (uuid.size() == 4 || uuid.size() == 8) {
-    for (size_t i = 0; i < uuid.size(); ++i) {
-      if (!IsHexDigit(uuid[i]))
-        return;
-    }
-    if (uuid.size() == 4) {
-      canonical->assign(uuid);
-      canonical_128->assign(kCommonUuidPrefix + uuid + kCommonUuidPostfix);
-      *format = UUID::kFormat16Bit;
-      return;
-    }
-    canonical->assign(uuid);
-    canonical_128->assign(uuid + kCommonUuidPostfix);
-    *format = UUID::kFormat32Bit;
-    return;
-  }
-
-  for (int i = 0; i < kUuidSize; ++i) {
-    if (i == 8 || i == 13 || i == 18 || i == 23) {
-      if (uuid[i] != '-')
-        return;
-    } else {
-      if (!IsHexDigit(uuid[i]))
-        return;
-      uuid[i] = tolower(uuid[i]);
-    }
-  }
-
-  canonical->assign(uuid);
-  canonical_128->assign(uuid);
-  *format = UUID::kFormat128Bit;
-}
-
-}  // namespace
-
-
-UUID::UUID(const std::string& uuid) {
-  GetCanonicalUuid(uuid, &value_, &canonical_value_, &format_);
-}
-
-UUID::~UUID() {
-}
-
-bool UUID::IsValid() const {
-  return format_ != kFormatInvalid;
-}
-
-bool UUID::operator<(const UUID& uuid) const {
-  return canonical_value_ < uuid.canonical_value_;
-}
-
-bool UUID::operator==(const UUID& uuid) const {
-  return canonical_value_ == uuid.canonical_value_;
-}
-
-bool UUID::operator!=(const UUID& uuid) const {
-  return canonical_value_ != uuid.canonical_value_;
-}
-
 std::string CanonicalUuid(std::string uuid) {
-  std::string value;
-  std::string canonical_value;
-  UUID::Format format;
-  GetCanonicalUuid(uuid, &value, &canonical_value, &format);
-  return canonical_value;
+  BluetoothUUID bt_uuid(uuid);
+  if (!bt_uuid.IsValid())
+    return "";
+  return bt_uuid.canonical_value();
 }
 
 }  // namespace bluetooth_utils