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

trunk/src/device/bluetooth/bluetooth_gatt_descriptor.h

Index: trunk/src/device/bluetooth/bluetooth_gatt_descriptor.h
===================================================================
--- trunk/src/device/bluetooth/bluetooth_gatt_descriptor.h	(revision 261569)
+++ trunk/src/device/bluetooth/bluetooth_gatt_descriptor.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 {
 
@@ -36,7 +36,7 @@
   //    - Reliable Write: 0x0001
   //    - Writable Auxiliaries: 0x0002
   //
-  static const BluetoothUUID kCharacteristicExtendedPropertiesUuid;
+  static const bluetooth_utils::UUID kCharacteristicExtendedPropertiesUuid;
 
   // The "Characteristic User Description" descriptor defines a UTF-8 string of
   // variable size that is a user textual description of the associated
@@ -44,7 +44,7 @@
   // per characteristic. This descriptor can be written to if the "Writable
   // Auxiliaries" bit of the Characteristic Properties (via the "Characteristic
   // Extended Properties" descriptor) has been set.
-  static const BluetoothUUID kCharacteristicUserDescriptionUuid;
+  static const bluetooth_utils::UUID kCharacteristicUserDescriptionUuid;
 
   // The "Client Characteristic Configuration" descriptor defines how the
   // characteristic may be configured by a specific client. A server-side
@@ -58,7 +58,7 @@
   //    - Notification: 0x0001
   //    - Indication: 0x0002
   //
-  static const BluetoothUUID kClientCharacteristicConfigurationUuid;
+  static const bluetooth_utils::UUID kClientCharacteristicConfigurationUuid;
 
   // The "Server Characteristic Configuration" descriptor defines how the
   // characteristic may be configured for the server. There is one instance
@@ -71,7 +71,7 @@
   //    - Default: 0x0000
   //    - Broadcast: 0x0001
   //
-  static const BluetoothUUID kServerCharacteristicConfigurationUuid;
+  static const bluetooth_utils::UUID kServerCharacteristicConfigurationUuid;
 
   // The "Characteristic Presentation Format" declaration defines the format of
   // the Characteristic Value. The value is composed of 7 octets which are
@@ -81,7 +81,7 @@
   // than one declaration of this descriptor exists for a characteristic, then a
   // "Characteristic Aggregate Format" descriptor must also exist for that
   // characteristic.
-  static const BluetoothUUID kCharacteristicPresentationFormatUuid;
+  static const bluetooth_utils::UUID kCharacteristicPresentationFormatUuid;
 
   // The "Characteristic Aggregate Format" descriptor defines the format of an
   // aggragated characteristic value. In GATT's underlying protocol, ATT, each
@@ -103,7 +103,7 @@
   // Similarly for local characteristics, implementations DO NOT need to create
   // an instance of BluetoothGattDescriptor for this descriptor as this will be
   // handled by the subsystem.
-  static const BluetoothUUID kCharacteristicAggregateFormatUuid;
+  static const bluetooth_utils::UUID kCharacteristicAggregateFormatUuid;
 
   // Interface for observing changes from a BluetoothGattDescriptor.
   // Properties of remote characteristic desciptors are received asynchonously.
@@ -115,7 +115,7 @@
     // Called when the UUID of |descriptor| has changed.
     virtual void UuidChanged(
         BluetoothGattDescriptor* descriptor,
-        const BluetoothUUID& uuid) {}
+        const bluetooth_utils::UUID& uuid) {}
 
     // Called when the current value of |descriptor| has changed.
     virtual void ValueChanged(
@@ -153,11 +153,11 @@
   // |kCharacteristicPresentationFormat| are supported for locally hosted
   // descriptors. This method will return NULL if |uuid| is any one of the
   // unsupported predefined descriptor UUIDs.
-  static BluetoothGattDescriptor* Create(const BluetoothUUID& uuid,
+  static BluetoothGattDescriptor* Create(const bluetooth_utils::UUID& uuid,
                                          const std::vector<uint8>& value);
 
   // The Bluetooth-specific UUID of the characteristic descriptor.
-  virtual const BluetoothUUID& GetUuid() const = 0;
+  virtual const bluetooth_utils::UUID& GetUuid() const = 0;
 
   // Returns true, if this characteristic descriptor is hosted locally. If
   // false, then this instance represents a remote descriptor.