Pass signin_scoped_device_id to DeviceInfoSpecifics.

chrome/browser/sync/glue/synced_device_tracker_unittest.cc

Index: chrome/browser/sync/glue/synced_device_tracker_unittest.cc
diff --git a/chrome/browser/sync/glue/synced_device_tracker_unittest.cc b/chrome/browser/sync/glue/synced_device_tracker_unittest.cc
index 4596b5a199e6a5fe777f11c6aded50b881ea630a..47e242cbd32a11be173413a191970ad07cc30bdf 100644
--- a/chrome/browser/sync/glue/synced_device_tracker_unittest.cc
+++ b/chrome/browser/sync/glue/synced_device_tracker_unittest.cc
@@ -30,6 +30,7 @@ void ConvertDeviceInfoSpecifics(
   specifics->set_chrome_version(device_info.chrome_version());
   specifics->set_sync_user_agent(device_info.sync_user_agent());
   specifics->set_device_type(device_info.device_type());
+  specifics->set_signin_scoped_device_id(device_info.signin_scoped_device_id());
 }
 
 }  // namespace
@@ -109,10 +110,12 @@ TEST_F(SyncedDeviceTrackerTest, CreateNewDeviceInfo) {
   // name to ensure that SyncedDeviceTracker can properly handle non-ASCII
   // characters, which client names can include on some platforms (e.g., Mac
   // and iOS).
-  DeviceInfo write_device_info(
-      user_share()->directory->cache_guid(),
-      "John’s Device", "Chromium 3000", "ChromeSyncAgent 3000",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
+  DeviceInfo write_device_info(user_share()->directory->cache_guid(),
+                               "John’s Device",
+                               "Chromium 3000",
+                               "ChromeSyncAgent 3000",
+                               sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                               "device_id");
   WriteLocalDeviceInfo(write_device_info);
 
   scoped_ptr<DeviceInfo> read_device_info(
@@ -126,10 +129,12 @@ TEST_F(SyncedDeviceTrackerTest, CreateNewDeviceInfo) {
 // Restart scenario: update existing device info with identical data.
 TEST_F(SyncedDeviceTrackerTest, DontModifyExistingDeviceInfo) {
   // For writing.
-  DeviceInfo device_info(
-      user_share()->directory->cache_guid(),
-      "John’s Device", "XYZ v1", "XYZ SyncAgent v1",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
+  DeviceInfo device_info(user_share()->directory->cache_guid(),
+                         "John’s Device",
+                         "XYZ v1",
+                         "XYZ SyncAgent v1",
+                         sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                         "device_id");
   WriteLocalDeviceInfo(device_info);
 
   // First read.
@@ -155,19 +160,23 @@ TEST_F(SyncedDeviceTrackerTest, DontModifyExistingDeviceInfo) {
 // Upgrade scenario: update existing device info with new version.
 TEST_F(SyncedDeviceTrackerTest, UpdateExistingDeviceInfo) {
   // Write v1 device info.
-  DeviceInfo device_info_v1(
-      user_share()->directory->cache_guid(),
-      "John’s Device", "XYZ v1", "XYZ SyncAgent v1",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
+  DeviceInfo device_info_v1(user_share()->directory->cache_guid(),
+                            "John’s Device",
+                            "XYZ v1",
+                            "XYZ SyncAgent v1",
+                            sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                            "device_id1");
   WriteLocalDeviceInfo(device_info_v1);
 
   ResetObservedChangesCounter();
 
   // Write upgraded device info.
-  DeviceInfo device_info_v2(
-      user_share()->directory->cache_guid(),
-      "John’s Device", "XYZ v2", "XYZ SyncAgent v2",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
+  DeviceInfo device_info_v2(user_share()->directory->cache_guid(),
+                            "John’s Device",
+                            "XYZ v2",
+                            "XYZ SyncAgent v2",
+                            sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                            "device_id2");
   WriteLocalDeviceInfo(device_info_v2);
 
   // Verify result.
@@ -183,17 +192,21 @@ TEST_F(SyncedDeviceTrackerTest, UpdateExistingDeviceInfo) {
 
 // Test retrieving DeviceInfos for all the syncing devices.
 TEST_F(SyncedDeviceTrackerTest, GetAllDeviceInfo) {
-  DeviceInfo device_info1(
-      base::GenerateGUID(),
-      "abc Device", "XYZ v1", "XYZ SyncAgent v1",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
+  DeviceInfo device_info1(base::GenerateGUID(),
+                          "abc Device",
+                          "XYZ v1",
+                          "XYZ SyncAgent v1",
+                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                          "device_id1");
 
   std::string guid1 = base::GenerateGUID();
 
-  DeviceInfo device_info2(
-      base::GenerateGUID(),
-      "def Device", "XYZ v2", "XYZ SyncAgent v2",
-      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
+  DeviceInfo device_info2(base::GenerateGUID(),
+                          "def Device",
+                          "XYZ v2",
+                          "XYZ SyncAgent v2",
+                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                          "device_id2");
 
   std::string guid2 = base::GenerateGUID();