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

trunk/src/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc

 // Copyright 2014 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 "chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/bluetooth/bluetooth_manifest_data.h"
 #include "chrome/common/extensions/api/manifest_types.h"
-#include "device/bluetooth/bluetooth_uuid.h"
+#include "device/bluetooth/bluetooth_utils.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_constants.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 namespace bluetooth_errors {
 const char kErrorInvalidUuid[] = "Invalid UUID '*'";
 }
 
 namespace errors = bluetooth_errors;
 
 namespace {
 
 bool ParseUuid(BluetoothManifestPermission* permission,
                const std::string& uuid,
                base::string16* error) {
-  device::BluetoothUUID bt_uuid(uuid);
-  if (!bt_uuid.IsValid()) {
+  std::string canonical_uuid = device::bluetooth_utils::CanonicalUuid(uuid);
+  if (canonical_uuid.empty()) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         errors::kErrorInvalidUuid, uuid);
     return false;
   }
   permission->AddPermission(uuid);
   return true;
 }
 
 bool ParseUuidArray(BluetoothManifestPermission* permission,
                     const scoped_ptr<std::vector<std::string> >& uuids,
@@ skipping 30 matching lines @@
       return scoped_ptr<BluetoothManifestPermission>();
     }
   }
   return result.Pass();
 }
 
 bool BluetoothManifestPermission::CheckRequest(
     const Extension* extension,
     const BluetoothPermissionRequest& request) const {
 
-  device::BluetoothUUID param_uuid(request.uuid);
+  std::string canonical_param_uuid =
+      device::bluetooth_utils::CanonicalUuid(request.uuid);
   for (BluetoothUuidSet::const_iterator it = uuids_.begin();
        it != uuids_.end();
        ++it) {
-    device::BluetoothUUID uuid(*it);
-    if (param_uuid == uuid)
+    std::string canonical_uuid = device::bluetooth_utils::CanonicalUuid(*it);
+    if (canonical_uuid == canonical_param_uuid)
       return true;
   }
   return false;
 }
 
 std::string BluetoothManifestPermission::name() const {
   return manifest_keys::kBluetooth;
 }
 
 std::string BluetoothManifestPermission::id() const { return name(); }
@@ skipping 108 matching lines @@
 
 void BluetoothManifestPermission::Log(std::string* log) const {
   IPC::LogParam(uuids_, log);
 }
 
 void BluetoothManifestPermission::AddPermission(const std::string& uuid) {
   uuids_.insert(uuid);
 }
 
 }  // namespace extensions