Chromium Code Reviews| Index: chrome/browser/sync/profile_sync_service_harness.cc |
| diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc |
| index 135eaf795e1b5faeaa51d12107326392fa1fdf8b..cce0aa069d05106869a01bf67d5179cfff150b95 100644 |
| --- a/chrome/browser/sync/profile_sync_service_harness.cc |
| +++ b/chrome/browser/sync/profile_sync_service_harness.cc |
| @@ -311,6 +311,13 @@ bool ProfileSyncServiceHarness::RunStateChangeMachine() { |
| } |
| break; |
| } |
| + case WAITING_FOR_SYNC_DISABLED: { |
| + VLOG(1) << GetClientInfoString("WAITING_FOR_SYNC_DISABLED"); |
| + if (service()->HasSyncSetupCompleted() == false) { |
| + // Sync has been disabled. |
| + SignalStateCompleteWithNextState(SYNC_DISABLED); |
| + } |
|
tim (not reviewing)
2011/07/26 19:32:17
should have a a break; here
lipalani1
2011/07/27 01:15:22
Done.
|
| + } |
| case SERVER_UNREACHABLE: { |
| VLOG(1) << GetClientInfoString("SERVER_UNREACHABLE"); |
| if (GetStatus().server_reachable) { |
| @@ -453,6 +460,18 @@ bool ProfileSyncServiceHarness::AwaitSyncCycleCompletion( |
| } |
| } |
| +bool ProfileSyncServiceHarness::AwaitSyncDisabled(const std::string& reason) { |
| + DCHECK(service()->HasSyncSetupCompleted()); |
| + DCHECK(wait_state_ != SYNC_DISABLED); |
|
tim (not reviewing)
2011/07/26 19:32:17
DCHECK_NE
lipalani1
2011/07/27 01:15:22
Done.
|
| + wait_state_ = WAITING_FOR_SYNC_DISABLED; |
| + AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason); |
| + if (wait_state_ == SYNC_DISABLED) { |
|
tim (not reviewing)
2011/07/26 19:32:17
this would be clearer as return wait_state_ == SYN
lipalani1
2011/07/27 01:15:22
Done.
|
| + return true; |
| + } else { |
| + return false; |
| + } |
| +} |
| + |
| bool ProfileSyncServiceHarness::AwaitMutualSyncCycleCompletion( |
| ProfileSyncServiceHarness* partner) { |
| VLOG(1) << GetClientInfoString("AwaitMutualSyncCycleCompletion"); |