Index: chrome/browser/sync/profile_sync_service_harness.h |
diff --git a/chrome/browser/sync/profile_sync_service_harness.h b/chrome/browser/sync/profile_sync_service_harness.h |
index fcaa603d9d2b463ee2598e706e993b312148ff46..bdeb187de9aa25090d2ff7c5efe2a43621bb72a2 100644 |
--- a/chrome/browser/sync/profile_sync_service_harness.h |
+++ b/chrome/browser/sync/profile_sync_service_harness.h |
@@ -67,7 +67,7 @@ class ProfileSyncServiceHarness |
// MigrationObserver implementation. |
virtual void OnMigrationStateChange() OVERRIDE; |
- // Blocks the caller until the sync backend host associated with this harness |
+ // Blocks the caller until sync backend host associated with this harness |
Raghu Simha
2011/09/19 22:25:02
Undo this change.
lipalani1
2011/09/22 20:42:46
Done.
|
// has been initialized. Returns true if the wait was successful. |
bool AwaitBackendInitialized(); |
@@ -80,17 +80,21 @@ class ProfileSyncServiceHarness |
// since the previous one. Returns true if a sync cycle has completed. |
bool AwaitSyncCycleCompletion(const std::string& reason); |
- // Blocks the caller until the sync has been disabled for this client. Returns |
+ // Blocks the caller until sync has been disabled for this client. Returns |
// true if sync is disabled. |
bool AwaitSyncDisabled(const std::string& reason); |
// Blocks the caller until exponential backoff has been verified to happen. |
bool AwaitExponentialBackoffVerification(); |
+ // Blocks the caller until the syncer receives an actionable error. And |
+ // return true if sync client had received an actionable error. |
Raghu Simha
2011/09/19 22:25:02
s/And return true if sync client had received/Retu
lipalani1
2011/09/22 20:42:46
Done.
Raghu Simha
2011/09/22 21:15:10
This isn't done yet.
s/And returns true if sync cl
lipalani1
2011/09/22 21:23:57
Done.
|
+ bool AwaitActionableError(); |
+ |
// Blocks until the given set of data types are migrated. |
bool AwaitMigration(const syncable::ModelTypeSet& expected_migrated_types); |
- // Blocks the caller until this harness has observed that the sync engine |
+ // Blocks the caller until this harness has observed that sync engine |
Raghu Simha
2011/09/19 22:25:02
Undo this change.
lipalani1
2011/09/22 20:42:46
Done.
|
// has downloaded all the changes seen by the |partner| harness's client. |
bool WaitUntilTimestampMatches( |
ProfileSyncServiceHarness* partner, const std::string& reason); |
@@ -125,10 +129,10 @@ class ProfileSyncServiceHarness |
// calling SetPassphrase has been accepted. |
bool AwaitPassphraseAccepted(); |
- // Returns the ProfileSyncService member of the the sync client. |
+ // Returns the ProfileSyncService member of sync client. |
Raghu Simha
2011/09/19 22:25:02
s/of sync client/of the sync client/
lipalani1
2011/09/22 20:42:46
Done.
|
ProfileSyncService* service() { return service_; } |
- // Returns the status of the ProfileSyncService member of the the sync client. |
+ // Returns the status of the ProfileSyncService member of sync client. |
Raghu Simha
2011/09/19 22:25:02
s/of sync client/of the sync client/
lipalani1
2011/09/22 20:42:46
Done.
|
ProfileSyncService::Status GetStatus(); |
// See ProfileSyncService::ShouldPushChanges(). |
@@ -150,7 +154,7 @@ class ProfileSyncServiceHarness |
const browser_sync::sessions::SyncSessionSnapshot* |
GetLastSessionSnapshot() const; |
- // Encrypt the datatype |type|. This method will block while the sync backend |
+ // Encrypt the datatype |type|. This method will block while sync backend |
Raghu Simha
2011/09/19 22:25:02
Undo this change.
lipalani1
2011/09/22 20:42:46
Done.
|
// host performs the encryption or a timeout is reached. |
// PostCondition: |
// returns: True if |type| was encrypted and we are fully synced. |
@@ -207,7 +211,7 @@ class ProfileSyncServiceHarness |
// full sync cycle is not expected to occur. |
WAITING_FOR_SYNC_CONFIGURATION, |
- // The sync client is waiting for the sync to be disabled for this client. |
+ // The sync client is waiting for sync to be disabled for this client. |
WAITING_FOR_SYNC_DISABLED, |
// The sync client is in the exponential backoff mode. Verify that |
@@ -220,6 +224,9 @@ class ProfileSyncServiceHarness |
// The sync client is waiting for migration to finish. |
WAITING_FOR_MIGRATION_TO_FINISH, |
+ // The sync client is waiting for an actionable error from the server. |
+ WAITING_FOR_ACTIONABLE_ERROR, |
+ |
// The client verification is complete. We don't care about the state of |
// the syncer any more. |
WAITING_FOR_NOTHING, |