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

trunk/src/device/bluetooth/bluetooth_gatt_service.h

Index: trunk/src/device/bluetooth/bluetooth_gatt_service.h
===================================================================
--- trunk/src/device/bluetooth/bluetooth_gatt_service.h	(revision 261569)
+++ trunk/src/device/bluetooth/bluetooth_gatt_service.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 {
 
@@ -133,7 +133,7 @@
     // Called when the UUID of |service| have changed.
     virtual void UuidChanged(
         BluetoothGattService* service,
-        const BluetoothUUID& uuid) {}
+        const bluetooth_utils::UUID& uuid) {}
 
     // Called when the services included by |service| have changed.
     virtual void IncludedServicesChanged(
@@ -157,12 +157,12 @@
   // peripheral role events. If |delegate| is NULL, then this service will
   // employ a default behavior when responding to read and write requests based
   // on the cached value of its characteristics and descriptors at a given time.
-  static BluetoothGattService* Create(const BluetoothUUID& uuid,
+  static BluetoothGattService* Create(const bluetooth_utils::UUID& uuid,
                                       bool is_primary,
                                       Delegate* delegate);
 
   // The Bluetooth-specific UUID of the service.
-  virtual const BluetoothUUID& GetUuid() const = 0;
+  virtual const bluetooth_utils::UUID& GetUuid() const = 0;
 
   // Returns true, if this service hosted locally. If false, then this service
   // represents a remote GATT service.