Pass signin_scoped_device_id to DeviceInfoSpecifics.

chrome/browser/sync/glue/sync_backend_host_core.cc

 // 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.
 
 #include "chrome/browser/sync/glue/sync_backend_host_core.h"
 
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/browser/sync/glue/invalidation_adapter.h"
@@ skipping 52 matching lines @@
     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,
     syncer::ReportUnrecoverableErrorFunction
-        report_unrecoverable_error_function)
+        report_unrecoverable_error_function,
+    const std::string& signin_scoped_device_id)
     : sync_loop(sync_loop),
       registrar(registrar),
       routing_info(routing_info),
       workers(workers),
       extensions_activity(extensions_activity),
       event_handler(event_handler),
       service_url(service_url),
       http_bridge_factory(http_bridge_factory.Pass()),
       credentials(credentials),
       invalidator_client_id(invalidator_client_id),
       sync_manager_factory(sync_manager_factory.Pass()),
       delete_sync_data_folder(delete_sync_data_folder),
       restored_key_for_bootstrapping(restored_key_for_bootstrapping),
       restored_keystore_key_for_bootstrapping(
           restored_keystore_key_for_bootstrapping),
       internal_components_factory(internal_components_factory.Pass()),
       unrecoverable_error_handler(unrecoverable_error_handler.Pass()),
-      report_unrecoverable_error_function(
-          report_unrecoverable_error_function) {
+      report_unrecoverable_error_function(report_unrecoverable_error_function),
+      signin_scoped_device_id(signin_scoped_device_id) {
 }
 
 DoInitializeOptions::~DoInitializeOptions() {}
 
 DoConfigureSyncerTypes::DoConfigureSyncerTypes() {}
 
 DoConfigureSyncerTypes::~DoConfigureSyncerTypes() {}
 
 SyncBackendHostCore::SyncBackendHostCore(
     const std::string& name,
@@ skipping 292 matching lines @@
     }
   }
 }
 
 void SyncBackendHostCore::DoInitialize(
     scoped_ptr<DoInitializeOptions> options) {
   DCHECK(!sync_loop_);
   sync_loop_ = options->sync_loop;
   DCHECK(sync_loop_);
 
+  signin_scoped_device_id_ = options->signin_scoped_device_id;
+
   // Finish initializing the HttpBridgeFactory.  We do this here because
   // building the user agent may block on some platforms.
   chrome::VersionInfo version_info;
   options->http_bridge_factory->Init(
       DeviceInfo::MakeUserAgentForSyncApi(version_info));
 
   // Blow away the partial or corrupt sync data folder before doing any more
   // initialization, if necessary.
   if (options->delete_sync_data_folder) {
     DeleteSyncDataFolder();
@@ skipping 84 matching lines @@
         &SyncBackendHostImpl::HandleInitializationFailureOnFrontendLoop);
     return;
   }
 
   // Initialize device info. This is asynchronous on some platforms, so we
   // provide a callback for when it finishes.
   synced_device_tracker_.reset(
       new SyncedDeviceTracker(sync_manager_->GetUserShare(),
                               sync_manager_->cache_guid()));
   synced_device_tracker_->InitLocalDeviceInfo(
+      signin_scoped_device_id_,
       base::Bind(&SyncBackendHostCore::DoFinishInitialProcessControlTypes,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void SyncBackendHostCore::DoFinishInitialProcessControlTypes() {
   DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
 
   registrar_->ActivateDataType(syncer::DEVICE_INFO,
                                syncer::GROUP_PASSIVE,
                                synced_device_tracker_.get(),
@@ skipping 222 matching lines @@
       this, &SyncBackendHostCore::SaveChanges);
 }
 
 void SyncBackendHostCore::SaveChanges() {
   DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
   sync_manager_->SaveChanges();
 }
 
 }  // namespace browser_sync