Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3684)

Unified Diff: device/bluetooth/bluetooth_utils.cc

Issue 224893002: device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_utils.h ('k') | device/bluetooth/bluetooth_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_utils.cc
diff --git a/device/bluetooth/bluetooth_utils.cc b/device/bluetooth/bluetooth_utils.cc
deleted file mode 100644
index b8747365d6add606394deacfd95ed2c9ced24b41..0000000000000000000000000000000000000000
--- a/device/bluetooth/bluetooth_utils.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) 2012 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_utils.h"
-
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/strings/string_util.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;
-}
-
-} // namespace bluetooth_utils
-} // namespace device
« no previous file with comments | « device/bluetooth/bluetooth_utils.h ('k') | device/bluetooth/bluetooth_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698