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

trunk/src/device/bluetooth/bluetooth_device_win.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_WIN_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_WIN_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 34 matching lines @@
   virtual void SetPinCode(const std::string& pincode) OVERRIDE;
   virtual void SetPasskey(uint32 passkey) OVERRIDE;
   virtual void ConfirmPairing() OVERRIDE;
   virtual void RejectPairing() OVERRIDE;
   virtual void CancelPairing() OVERRIDE;
   virtual void Disconnect(
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual void Forget(const ErrorCallback& error_callback) OVERRIDE;
   virtual void ConnectToService(
-      const device::BluetoothUUID& service_uuid,
+      const std::string& service_uuid,
       const SocketCallback& callback) OVERRIDE;
   virtual void ConnectToProfile(
       device::BluetoothProfile* profile,
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual void SetOutOfBandPairingData(
       const BluetoothOutOfBandPairingData& data,
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual void ClearOutOfBandPairingData(
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
 
   // Used by BluetoothProfileWin to retrieve the service record for the given
   // |uuid|.
   const BluetoothServiceRecord* GetServiceRecord(
-      const device::BluetoothUUID& uuid) const;
+      const std::string& uuid) const;
 
  protected:
   // BluetoothDevice override
   virtual std::string GetDeviceName() const OVERRIDE;
 
  private:
   friend class BluetoothAdapterWin;
 
   // Used by BluetoothAdapterWin to update the visible state during
   // discovery.
@@ skipping 24 matching lines @@
   // The service records retrieved from SDP.
   typedef ScopedVector<BluetoothServiceRecord> ServiceRecordList;
   ServiceRecordList service_record_list_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceWin);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_WIN_H_