Use test UUIDs for device bluetooth unit tests

device/bluetooth/bluetooth_device_unittest.cc

Index: device/bluetooth/bluetooth_device_unittest.cc
diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc
index 7dd31ef84c282ecdcf48600762ebaf61c9413a2f..0659b75c149f4bda93a3de4f5a0fa102a4f0d400 100644
--- a/device/bluetooth/bluetooth_device_unittest.cc
+++ b/device/bluetooth/bluetooth_device_unittest.cc
@@ -1277,8 +1277,8 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectGatt_Cleanup) {
 
   // Discover services
   std::vector<std::string> services;
-  services.push_back("00000000-0000-1000-8000-00805f9b34fb");
-  services.push_back("00000001-0000-1000-8000-00805f9b34fb");
+  services.push_back(kTestUUIDGenericAccess);

[ortuno, 2017/04/06 00:56:19]

optional: We used push_back because initializer lists were not available then.
All new code uses initializer lists e.g. [1]. Since we are already changing the
UUIDs we might as well use initializer lists everywhere:

SimulateGattServicesDiscovered(
  device,
  std::vector<std::string>({kTestUUIDGenericAccess, kTestUUIDHeartRate}));


[1]
https://cs.chromium.org/chromium/src/device/bluetooth/bluetooth_device_unitte...

[juncai, 2017/04/07 18:50:19]

Done.

+  services.push_back(kTestUUIDHeartRate);
   SimulateGattServicesDiscovered(device, services);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());
@@ -1302,7 +1302,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectGatt_Cleanup) {
 
   // Verify that service discovery can be done again
   std::vector<std::string> services2;
-  services2.push_back("00000002-0000-1000-8000-00805f9b34fb");
+  services2.push_back(kTestUUIDGenericAttribute);
   SimulateGattServicesDiscovered(device, services2);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());
@@ -1362,8 +1362,8 @@ TEST_F(BluetoothTest, GattServices_ObserversCalls) {
   EXPECT_EQ(1, gatt_discovery_attempts_);
 
   std::vector<std::string> services;
-  services.push_back("00000000-0000-1000-8000-00805f9b34fb");
-  services.push_back("00000001-0000-1000-8000-00805f9b34fb");
+  services.push_back(kTestUUIDGenericAccess);
+  services.push_back(kTestUUIDHeartRate);
   SimulateGattServicesDiscovered(device, services);
   base::RunLoop().RunUntilIdle();
 
@@ -1397,8 +1397,8 @@ TEST_F(BluetoothTest, GattServicesDiscovered_AfterDeleted) {
   DeleteDevice(device);
 
   std::vector<std::string> services;
-  services.push_back("00000000-0000-1000-8000-00805f9b34fb");
-  services.push_back("00000001-0000-1000-8000-00805f9b34fb");
+  services.push_back(kTestUUIDGenericAccess);
+  services.push_back(kTestUUIDHeartRate);
   SimulateGattServicesDiscovered(nullptr /* use remembered device */, services);
   base::RunLoop().RunUntilIdle();
 }
@@ -1455,8 +1455,8 @@ TEST_F(BluetoothTest, GattServicesDiscovered_AfterDisconnection) {
   base::RunLoop().RunUntilIdle();
 
   std::vector<std::string> services;
-  services.push_back("00000000-0000-1000-8000-00805f9b34fb");
-  services.push_back("00000001-0000-1000-8000-00805f9b34fb");
+  services.push_back(kTestUUIDGenericAccess);
+  services.push_back(kTestUUIDHeartRate);
   SimulateGattServicesDiscovered(device, services);
   base::RunLoop().RunUntilIdle();
 
@@ -1510,10 +1510,10 @@ TEST_F(BluetoothTest, GetGattServices_and_GetGattService) {
   EXPECT_EQ(1, gatt_discovery_attempts_);
 
   std::vector<std::string> services;
-  services.push_back("00000000-0000-1000-8000-00805f9b34fb");
+  services.push_back(kTestUUIDGenericAccess);
   // 2 duplicate UUIDs creating 2 instances.
-  services.push_back("00000001-0000-1000-8000-00805f9b34fb");
-  services.push_back("00000001-0000-1000-8000-00805f9b34fb");
+  services.push_back(kTestUUIDHeartRate);
+  services.push_back(kTestUUIDHeartRate);
   SimulateGattServicesDiscovered(device, services);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(3u, device->GetGattServices().size());