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

trunk/src/device/bluetooth/bluetooth_chromeos_unittest.cc

Index: trunk/src/device/bluetooth/bluetooth_chromeos_unittest.cc
===================================================================
--- trunk/src/device/bluetooth/bluetooth_chromeos_unittest.cc	(revision 261569)
+++ trunk/src/device/bluetooth/bluetooth_chromeos_unittest.cc	(working copy)
@@ -25,7 +25,6 @@
 using device::BluetoothAdapterFactory;
 using device::BluetoothDevice;
 using device::BluetoothDiscoverySession;
-using device::BluetoothUUID;
 
 namespace chromeos {
 
@@ -1449,8 +1448,8 @@
 
   BluetoothDevice::UUIDList uuids = devices[0]->GetUUIDs();
   ASSERT_EQ(2U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1800"));
-  EXPECT_EQ(uuids[1], BluetoothUUID("1801"));
+  EXPECT_EQ(uuids[0], "00001800-0000-1000-8000-00805f9b34fb");
+  EXPECT_EQ(uuids[1], "00001801-0000-1000-8000-00805f9b34fb");
 
   EXPECT_EQ(BluetoothDevice::VENDOR_ID_USB, devices[0]->GetVendorIDSource());
   EXPECT_EQ(0x05ac, devices[0]->GetVendorID());
@@ -1524,8 +1523,8 @@
 
   BluetoothDevice::UUIDList uuids = devices[0]->GetUUIDs();
   ASSERT_EQ(2U, uuids.size());
-  ASSERT_EQ(uuids[0], BluetoothUUID("1800"));
-  ASSERT_EQ(uuids[1], BluetoothUUID("1801"));
+  ASSERT_EQ(uuids[0], "00001800-0000-1000-8000-00805f9b34fb");
+  ASSERT_EQ(uuids[1], "00001801-0000-1000-8000-00805f9b34fb");
 
   // Install an observer; expect the DeviceChanged method to be called when
   // we change the class of the device.
@@ -1535,14 +1534,11 @@
       fake_bluetooth_device_client_->GetProperties(
           dbus::ObjectPath(FakeBluetoothDeviceClient::kPairedDevicePath));
 
-  std::vector<std::string> new_uuids;
-  new_uuids.push_back(uuids[0].canonical_value());
-  new_uuids.push_back(uuids[1].canonical_value());
-  new_uuids.push_back("0000110c-0000-1000-8000-00805f9b34fb");
-  new_uuids.push_back("0000110e-0000-1000-8000-00805f9b34fb");
-  new_uuids.push_back("0000110a-0000-1000-8000-00805f9b34fb");
+  uuids.push_back("0000110c-0000-1000-8000-00805f9b34fb");
+  uuids.push_back("0000110e-0000-1000-8000-00805f9b34fb");
+  uuids.push_back("0000110a-0000-1000-8000-00805f9b34fb");
 
-  properties->uuids.ReplaceValue(new_uuids);
+  properties->uuids.ReplaceValue(uuids);
 
   EXPECT_EQ(1, observer.device_changed_count_);
   EXPECT_EQ(devices[0], observer.last_device_);
@@ -1550,11 +1546,11 @@
   // Fetching the value should give the new one.
   uuids = devices[0]->GetUUIDs();
   ASSERT_EQ(5U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1800"));
-  EXPECT_EQ(uuids[1], BluetoothUUID("1801"));
-  EXPECT_EQ(uuids[2], BluetoothUUID("110c"));
-  EXPECT_EQ(uuids[3], BluetoothUUID("110e"));
-  EXPECT_EQ(uuids[4], BluetoothUUID("110a"));
+  EXPECT_EQ(uuids[0], "00001800-0000-1000-8000-00805f9b34fb");
+  EXPECT_EQ(uuids[1], "00001801-0000-1000-8000-00805f9b34fb");
+  EXPECT_EQ(uuids[2], "0000110c-0000-1000-8000-00805f9b34fb");
+  EXPECT_EQ(uuids[3], "0000110e-0000-1000-8000-00805f9b34fb");
+  EXPECT_EQ(uuids[4], "0000110a-0000-1000-8000-00805f9b34fb");
 }
 
 TEST_F(BluetoothChromeOSTest, ForgetDevice) {
@@ -1704,7 +1700,7 @@
   // Verify is a HID device and is not connectable.
   BluetoothDevice::UUIDList uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_EQ(uuids[0], "00001124-0000-1000-8000-00805f9b34fb");
   EXPECT_FALSE(device->IsConnectable());
 }
 
@@ -1894,7 +1890,7 @@
   // Verify is a HID device and is connectable.
   BluetoothDevice::UUIDList uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_EQ(uuids[0], "00001124-0000-1000-8000-00805f9b34fb");
   EXPECT_TRUE(device->IsConnectable());
 
   // Make sure the trusted property has been set to true.
@@ -1950,7 +1946,7 @@
   // Verify is a HID device and is connectable.
   BluetoothDevice::UUIDList uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_EQ(uuids[0], "00001124-0000-1000-8000-00805f9b34fb");
   EXPECT_TRUE(device->IsConnectable());
 
   // Make sure the trusted property has been set to true.
@@ -2026,7 +2022,7 @@
   // Verify is a HID device.
   BluetoothDevice::UUIDList uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_EQ(uuids[0], "00001124-0000-1000-8000-00805f9b34fb");
 
   // And usually not connectable.
   EXPECT_FALSE(device->IsConnectable());