Chromium Code Reviews| 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 aae5d418543d163dea1cac4019d80a3c2658a571..e8dc391edab514f23d10e24cc7261936c1372873 100644 |
| --- a/sync/internal_api/sync_manager_impl.cc |
| +++ b/sync/internal_api/sync_manager_impl.cc |
| @@ -597,10 +597,14 @@ void SyncManagerImpl::UpdateCredentials(const SyncCredentials& credentials) { |
| DCHECK(!credentials.email.empty()); |
| DCHECK(!credentials.sync_token.empty()); |
| - observing_network_connectivity_changes_ = true; |
| if (!connection_manager_->set_auth_token(credentials.sync_token)) |
| return; // Auth token is known to be invalid, so exit early. |
| + if (connection_manager_->server_status() == HttpResponse::SYNC_AUTH_ERROR) |
| + connection_manager_->SetServerStatus(HttpResponse::TOKEN_REFRESHED); |
| + |
|
Andrew T Wilson (Slow)
2013/05/24 14:10:15
Hmm. I'm not sure why it's safe to move "observing
pavely
2013/05/30 07:42:12
if(set_auth_token) condition means "New credential
|
| + observing_network_connectivity_changes_ = true; |
| + |
| invalidator_->UpdateCredentials(credentials.email, credentials.sync_token); |
| scheduler_->OnCredentialsUpdated(); |
| } |