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

trunk/src/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc

 // 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 "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
 
 #include <string>
 
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h"
 #include "chrome/common/extensions/api/bluetooth.h"
 #include "chrome/common/extensions/api/bluetooth/bluetooth_manifest_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
 #include "device/bluetooth/bluetooth_profile.h"
 #include "device/bluetooth/bluetooth_service_record.h"
 #include "device/bluetooth/bluetooth_socket.h"
+#include "device/bluetooth/bluetooth_utils.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "net/base/io_buffer.h"
 
 using content::BrowserContext;
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 using device::BluetoothProfile;
 using device::BluetoothServiceRecord;
@@ skipping 94 matching lines @@
 
 namespace api {
 
 BluetoothAddProfileFunction::BluetoothAddProfileFunction() {
 }
 
 bool BluetoothAddProfileFunction::RunImpl() {
   scoped_ptr<AddProfile::Params> params(AddProfile::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get() != NULL);
 
-  device::BluetoothUUID uuid(params->profile.uuid);
-
-  if (!uuid.IsValid()) {
+  if (!BluetoothDevice::IsUUIDValid(params->profile.uuid)) {
     SetError(kInvalidUuid);
     return false;
   }
 
   BluetoothPermissionRequest param(params->profile.uuid);
   if (!BluetoothManifestData::CheckRequest(GetExtension(), param)) {
     error_ = kPermissionDenied;
     return false;
   }
 
-  uuid_ = uuid;
+  uuid_ = device::bluetooth_utils::CanonicalUuid(params->profile.uuid);
 
   if (GetEventRouter(browser_context())->HasProfile(uuid_)) {
     SetError(kProfileAlreadyRegistered);
     return false;
   }
 
   BluetoothProfile::Options options;
   if (params->profile.name.get())
     options.name = *params->profile.name.get();
   if (params->profile.channel.get())
@@ skipping 50 matching lines @@
                  uuid_));
   GetEventRouter(browser_context())
       ->AddProfile(uuid_, extension_id(), bluetooth_profile);
   SendResponse(true);
 }
 
 bool BluetoothRemoveProfileFunction::RunImpl() {
   scoped_ptr<RemoveProfile::Params> params(
       RemoveProfile::Params::Create(*args_));
 
-  device::BluetoothUUID uuid(params->profile.uuid);
-
-  if (!uuid.IsValid()) {
+  if (!BluetoothDevice::IsUUIDValid(params->profile.uuid)) {
     SetError(kInvalidUuid);
     return false;
   }
 
+  std::string uuid =
+      device::bluetooth_utils::CanonicalUuid(params->profile.uuid);
+
   if (!GetEventRouter(browser_context())->HasProfile(uuid)) {
     SetError(kProfileNotFound);
     return false;
   }
 
   GetEventRouter(browser_context())->RemoveProfile(uuid);
   return true;
 }
 
 bool BluetoothGetAdapterStateFunction::DoWork(
@@ skipping 59 matching lines @@
 void BluetoothConnectFunction::OnErrorCallback() {
   SetError(kFailedToConnect);
   SendResponse(false);
 }
 
 bool BluetoothConnectFunction::DoWork(scoped_refptr<BluetoothAdapter> adapter) {
   scoped_ptr<Connect::Params> params(Connect::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get() != NULL);
   const bluetooth::ConnectOptions& options = params->options;
 
-  device::BluetoothUUID uuid(options.profile.uuid);
-
-  if (!uuid.IsValid()) {
+  if (!BluetoothDevice::IsUUIDValid(options.profile.uuid)) {
     SetError(kInvalidUuid);
     SendResponse(false);
     return false;
   }
 
   BluetoothDevice* device = adapter->GetDevice(options.device.address);
   if (!device) {
     SetError(kInvalidDevice);
     SendResponse(false);
     return false;
   }
 
+  std::string uuid = device::bluetooth_utils::CanonicalUuid(
+      options.profile.uuid);
+
   BluetoothProfile* bluetooth_profile =
       GetEventRouter(browser_context())->GetProfile(uuid);
   if (!bluetooth_profile) {
     SetError(kProfileNotFound);
     SendResponse(false);
     return false;
   }
 
   device->ConnectToProfile(
       bluetooth_profile,
@@ skipping 241 matching lines @@
       adapter,
       extension_id(),
       base::Bind(&BluetoothStopDiscoveryFunction::OnSuccessCallback, this),
       base::Bind(&BluetoothStopDiscoveryFunction::OnErrorCallback, this));
 
   return true;
 }
 
 }  // namespace api
 }  // namespace extensions