Pass signin_scoped_device_id to DeviceInfoSpecifics.

chrome/browser/sync/glue/sync_backend_host_core.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_
 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_
 
 #include "base/memory/ref_counted.h"
 
 #include "base/timer/timer.h"
@@ skipping 18 matching lines @@
       const scoped_refptr<syncer::ExtensionsActivity>& extensions_activity,
       const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
       const GURL& service_url,
       scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory,
       const syncer::SyncCredentials& credentials,
       const std::string& invalidator_client_id,
       scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory,
       bool delete_sync_data_folder,
       const std::string& restored_key_for_bootstrapping,
       const std::string& restored_keystore_key_for_bootstrapping,
-      scoped_ptr<syncer::InternalComponentsFactory>
-          internal_components_factory,
-      scoped_ptr<syncer::UnrecoverableErrorHandler>
-          unrecoverable_error_handler,
+      scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
+      scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler,
       syncer::ReportUnrecoverableErrorFunction
-          report_unrecoverable_error_function);
+          report_unrecoverable_error_function,
+      const std::string& signin_scoped_device_id);
   ~DoInitializeOptions();
 
   base::MessageLoop* sync_loop;
   SyncBackendRegistrar* registrar;
   syncer::ModelSafeRoutingInfo routing_info;
   std::vector<scoped_refptr<syncer::ModelSafeWorker> > workers;
   scoped_refptr<syncer::ExtensionsActivity> extensions_activity;
   syncer::WeakHandle<syncer::JsEventHandler> event_handler;
   GURL service_url;
   // Overridden by tests.
   scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory;
   syncer::SyncCredentials credentials;
   const std::string invalidator_client_id;
   scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory;
   std::string lsid;
   bool delete_sync_data_folder;
   std::string restored_key_for_bootstrapping;
   std::string restored_keystore_key_for_bootstrapping;
   scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory;
   scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler;
   syncer::ReportUnrecoverableErrorFunction
       report_unrecoverable_error_function;
+  std::string signin_scoped_device_id;
 };
 
 // Helper struct to handle currying params to
 // SyncBackendHost::Core::DoConfigureSyncer.
 struct DoConfigureSyncerTypes {
   DoConfigureSyncerTypes();
   ~DoConfigureSyncerTypes();
   syncer::ModelTypeSet to_download;
   syncer::ModelTypeSet to_purge;
   syncer::ModelTypeSet to_journal;
@@ skipping 238 matching lines @@
   // Matches the value of SyncPref's HasSyncSetupCompleted() flag at init time.
   // Should not be used for anything except for UMAs and logging.
   const bool has_sync_setup_completed_;
 
   // Set when we've been asked to forward sync protocol events to the frontend.
   bool forward_protocol_events_;
 
   // Set when the forwarding of per-type debug counters is enabled.
   bool forward_type_info_;
 
+  std::string signin_scoped_device_id_;

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

nit: Comment this member.

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

Done.

+
   base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_