Pass signin_scoped_device_id to DeviceInfoSpecifics.

chrome/browser/sync/glue/device_info.h

Index: chrome/browser/sync/glue/device_info.h
diff --git a/chrome/browser/sync/glue/device_info.h b/chrome/browser/sync/glue/device_info.h
index d94a9bc2b5637156d3206d73259aa6adfc6b29c3..a46e6508799a63c683522196d0633c96b3cd6c04 100644
--- a/chrome/browser/sync/glue/device_info.h
+++ b/chrome/browser/sync/glue/device_info.h
@@ -28,7 +28,8 @@ class DeviceInfo {
              const std::string& client_name,
              const std::string& chrome_version,
              const std::string& sync_user_agent,
-             const sync_pb::SyncEnums::DeviceType device_type);
+             const sync_pb::SyncEnums::DeviceType device_type,
+             const std::string& signin_scoped_device_id);
   ~DeviceInfo();
 
   // Sync specific unique identifier for the device. Note if a device
@@ -54,6 +55,10 @@ class DeviceInfo {
   // Device Type.
   sync_pb::SyncEnums::DeviceType device_type() const;
 
+  // Device_id that is stable until user signs out. This device_id is used for
+  // annotating login scoped refresh token.
+  const std::string& signin_scoped_device_id() const;
+
   // Gets the OS in string form.
   std::string GetOSString() const;
 
@@ -79,6 +84,7 @@ class DeviceInfo {
   // it as parameter to the callback.
   static void CreateLocalDeviceInfo(
       const std::string& guid,
+      const std::string& signin_scoped_device_id,
       base::Callback<void(const DeviceInfo& local_info)> callback);
 
   // Gets the local device name and passes it as a parameter to callback.
@@ -98,6 +104,7 @@ class DeviceInfo {
 
   static void CreateLocalDeviceInfoContinuation(
       const std::string& guid,
+      const std::string& signin_scoped_device_id,
       base::Callback<void(const DeviceInfo& local_info)> callback,
       const std::string& session_name);
 
@@ -111,6 +118,8 @@ class DeviceInfo {
 
   const sync_pb::SyncEnums::DeviceType device_type_;
 
+  std::string signin_scoped_device_id_;
+
   // Exposing |guid| would lead to a stable unique id for a device which
   // can potentially be used for tracking. Public ids are privacy safe
   // ids in that the same device will have different id for different apps