Index: components/browser_sync/browser/profile_sync_service.cc |
diff --git a/components/browser_sync/browser/profile_sync_service.cc b/components/browser_sync/browser/profile_sync_service.cc |
index 7a57b2f5654bbf4a3e7eee4e2bc37a17e7e9eb21..ee8e817232425061079e7f909ec66b48236c0dd7 100644 |
--- a/components/browser_sync/browser/profile_sync_service.cc |
+++ b/components/browser_sync/browser/profile_sync_service.cc |
@@ -381,7 +381,14 @@ void ProfileSyncService::Initialize() { |
base::Bind(&ProfileSyncService::OnMemoryPressure, |
sync_enabled_weak_factory_.GetWeakPtr()))); |
startup_controller_->Reset(GetRegisteredDataTypes()); |
- startup_controller_->TryStart(); |
+ |
+ // Auto-start means means the first time the profile starts up, sync should |
+ // start up immediately. |
+ if (start_behavior_ == AUTO_START && !IsFirstSetupComplete()) { |
+ startup_controller_->TryStartImmediately(); |
+ } else { |
+ startup_controller_->TryStart(); |
+ } |
} |
void ProfileSyncService::StartSyncingWithServer() { |