Index: sync/internal_api/sync_manager_impl.cc |
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc |
index 7e173d15fa2f7de34acda28501b7d6db394abba1..925251165541b7f6c5cd8e2afc2377c90a219e1e 100644 |
--- a/sync/internal_api/sync_manager_impl.cc |
+++ b/sync/internal_api/sync_manager_impl.cc |
@@ -426,10 +426,6 @@ bool SyncManagerImpl::Init( |
report_unrecoverable_error_function_, |
backing_store.release())); |
- connection_manager_.reset(new SyncAPIServerConnectionManager( |
- sync_server_and_path, port, use_ssl, post_factory.release())); |
- connection_manager_->AddListener(this); |
- |
DVLOG(1) << "Username: " << username_for_share(); |
if (!OpenDirectory()) { |
FOR_EACH_OBSERVER(SyncManager::Observer, observers_, |
@@ -439,6 +435,11 @@ bool SyncManagerImpl::Init( |
return false; |
} |
+ connection_manager_.reset(new SyncAPIServerConnectionManager( |
+ sync_server_and_path, port, use_ssl, post_factory.release())); |
+ connection_manager_->set_client_id(directory()->cache_guid()); |
+ connection_manager_->AddListener(this); |
+ |
// Retrieve and set the sync notifier state. |
std::string unique_id = directory()->cache_guid(); |
DVLOG(1) << "Read notification unique ID: " << unique_id; |
@@ -685,7 +686,6 @@ bool SyncManagerImpl::OpenDirectory() { |
if (!PurgePartiallySyncedTypes()) |
return false; |
- connection_manager_->set_client_id(directory()->cache_guid()); |
tim (not reviewing)
2012/07/31 21:14:36
ah, yeah, good to move this up
|
return true; |
} |