Pass signin_scoped_device_id to DeviceInfoSpecifics.

chrome/browser/sync/glue/synced_device_tracker.cc

Index: chrome/browser/sync/glue/synced_device_tracker.cc
diff --git a/chrome/browser/sync/glue/synced_device_tracker.cc b/chrome/browser/sync/glue/synced_device_tracker.cc
index bf7fa9274fc78f9303bb4dd184b690e32702f28f..20220e807c5989cd133e1903b37b366b0160e42d 100644
--- a/chrome/browser/sync/glue/synced_device_tracker.cc
+++ b/chrome/browser/sync/glue/synced_device_tracker.cc
@@ -67,12 +67,13 @@ scoped_ptr<DeviceInfo> SyncedDeviceTracker::ReadLocalDeviceInfo(
   }
 
   const sync_pb::DeviceInfoSpecifics& specifics = node.GetDeviceInfoSpecifics();
-  return scoped_ptr<DeviceInfo> (
+  return scoped_ptr<DeviceInfo>(
       new DeviceInfo(specifics.cache_guid(),
                      specifics.client_name(),
                      specifics.chrome_version(),
                      specifics.sync_user_agent(),
-                     specifics.device_type()));
+                     specifics.device_type(),
+                     specifics.signin_scoped_device_id()));
 }
 
 scoped_ptr<DeviceInfo> SyncedDeviceTracker::ReadDeviceInfo(
@@ -86,12 +87,13 @@ scoped_ptr<DeviceInfo> SyncedDeviceTracker::ReadDeviceInfo(
   }
 
   const sync_pb::DeviceInfoSpecifics& specifics = node.GetDeviceInfoSpecifics();
-  return scoped_ptr<DeviceInfo> (
+  return scoped_ptr<DeviceInfo>(
       new DeviceInfo(specifics.cache_guid(),
                      specifics.client_name(),
                      specifics.chrome_version(),
                      specifics.sync_user_agent(),
-                     specifics.device_type()));
+                     specifics.device_type(),
+                     specifics.signin_scoped_device_id()));
 }
 
 void SyncedDeviceTracker::GetAllSyncedDeviceInfo(
@@ -122,12 +124,12 @@ void SyncedDeviceTracker::GetAllSyncedDeviceInfo(
 
     const sync_pb::DeviceInfoSpecifics& specifics =
         node.GetDeviceInfoSpecifics();
-    device_info->push_back(
-        new DeviceInfo(specifics.cache_guid(),
-                       specifics.client_name(),
-                       specifics.chrome_version(),
-                       specifics.sync_user_agent(),
-                       specifics.device_type()));
+    device_info->push_back(new DeviceInfo(specifics.cache_guid(),
+                                          specifics.client_name(),
+                                          specifics.chrome_version(),
+                                          specifics.sync_user_agent(),
+                                          specifics.device_type(),
+                                          specifics.signin_scoped_device_id()));
   }
 }
 
@@ -143,11 +145,15 @@ void SyncedDeviceTracker::RemoveObserver(Observer* observer) {
   observers_->RemoveObserver(observer);
 }
 
-void SyncedDeviceTracker::InitLocalDeviceInfo(const base::Closure& callback) {
+void SyncedDeviceTracker::InitLocalDeviceInfo(
+    const std::string& signin_scoped_device_id,
+    const base::Closure& callback) {
   DeviceInfo::CreateLocalDeviceInfo(
       cache_guid_,
+      signin_scoped_device_id,
       base::Bind(&SyncedDeviceTracker::InitLocalDeviceInfoContinuation,
-                 weak_factory_.GetWeakPtr(), callback));
+                 weak_factory_.GetWeakPtr(),
+                 callback));
 }
 
 void SyncedDeviceTracker::InitLocalDeviceInfoContinuation(
@@ -164,6 +170,7 @@ void SyncedDeviceTracker::WriteLocalDeviceInfo(const DeviceInfo& info) {
   specifics.set_chrome_version(info.chrome_version());
   specifics.set_sync_user_agent(info.sync_user_agent());
   specifics.set_device_type(info.device_type());
+  specifics.set_signin_scoped_device_id(info.signin_scoped_device_id());
 
   WriteDeviceInfo(specifics, local_device_info_tag_);
 }