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

trunk/src/device/bluetooth/bluetooth_gatt_characteristic.h

Index: trunk/src/device/bluetooth/bluetooth_gatt_characteristic.h
===================================================================
--- trunk/src/device/bluetooth/bluetooth_gatt_characteristic.h	(revision 261569)
+++ trunk/src/device/bluetooth/bluetooth_gatt_characteristic.h	(working copy)
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "device/bluetooth/bluetooth_uuid.h"
+#include "device/bluetooth/bluetooth_utils.h"
 
 namespace device {
 
@@ -80,7 +80,7 @@
     // Called when the UUID of |characteristic| has changed.
     virtual void UuidChanged(
         BluetoothGattCharacteristic* characteristic,
-        const BluetoothUUID& uuid) {}
+        const bluetooth_utils::UUID& uuid) {}
 
     // Called when the current value of |characteristic| has changed.
     virtual void ValueChanged(
@@ -125,13 +125,13 @@
   // "Characteristic Extended Properties" descriptor and this will automatically
   // set the correspoding bit in the characteristic's properties field. If
   // |properties| has |kPropertyExtendedProperties| set, it will be ignored.
-  static BluetoothGattCharacteristic* Create(const BluetoothUUID& uuid,
+  static BluetoothGattCharacteristic* Create(const bluetooth_utils::UUID& uuid,
                                              const std::vector<uint8>& value,
                                              Properties properties,
                                              Permissions permissions);
 
   // The Bluetooth-specific UUID of the characteristic.
-  virtual const BluetoothUUID& GetUuid() const = 0;
+  virtual const bluetooth_utils::UUID& GetUuid() const = 0;
 
   // Returns true, if this characteristic is hosted locally. If false, then this
   // instance represents a remote GATT characteristic.