Pass signin_scoped_device_id to DeviceInfoSpecifics.

chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc

Index: chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
index b514b4b7f91916bedb0c1c4b4c0fe1f10e834af8..12cb4ea2c26c4dcaedfb92039f163c1cd495d5ea 100644
--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
@@ -31,13 +31,19 @@ bool VerifyDictionary(
 TEST(IdMappingHelperTest, SetIdsForDevices) {
   ScopedVector<DeviceInfo> devices;
 
-  devices.push_back(new DeviceInfo(
-      base::GenerateGUID(), "abc Device", "XYZ v1", "XYZ SyncAgent v1",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
-
-  devices.push_back(new DeviceInfo(
-      base::GenerateGUID(), "def Device", "XYZ v1", "XYZ SyncAgent v1",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
+  devices.push_back(new DeviceInfo(base::GenerateGUID(),
+                                   "abc Device",
+                                   "XYZ v1",
+                                   "XYZ SyncAgent v1",
+                                   sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                                   "device_id"));

[rlarocque, 2014/07/16 00:44:31]

Not that it really matters, but would it be more realistic if the "device_id"
string were different for each of these?

[pavely, 2014/07/16 21:35:59]

Done.

+
+  devices.push_back(new DeviceInfo(base::GenerateGUID(),
+                                   "def Device",
+                                   "XYZ v1",
+                                   "XYZ SyncAgent v1",
+                                   sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                                   "device_id"));
 
   base::DictionaryValue dictionary;
 
@@ -52,9 +58,12 @@ TEST(IdMappingHelperTest, SetIdsForDevices) {
   EXPECT_NE(public_id1, public_id2);
 
   // Now add a third device.
-  devices.push_back(new DeviceInfo(
-      base::GenerateGUID(), "ghi Device", "XYZ v1", "XYZ SyncAgent v1",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
+  devices.push_back(new DeviceInfo(base::GenerateGUID(),
+                                   "ghi Device",
+                                   "XYZ v1",
+                                   "XYZ SyncAgent v1",
+                                   sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                                   "device_id"));
 
   CreateMappingForUnmappedDevices(&(devices.get()), &dictionary);