Refactor sync passphrase setup flow and fix passphrase tests

chrome/browser/sync/glue/sync_backend_host.h

Index: chrome/browser/sync/glue/sync_backend_host.h
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index b5c2b707f698e081406a997c7cf158db4032fb0b..dea871fdae4917e131a5d68f4825b4a8dfcefe91 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -92,6 +92,10 @@ class SyncFrontend {
   // encrypted using the accepted passphrase.
   virtual void OnPassphraseAccepted() = 0;
 
+  // The syncer has attempted to set a passphrase, but failed to decrypt the
+  // cryptographer's pending keys. A new passphrase is required.
+  virtual void OnPassphraseFailed() = 0;

[tim (not reviewing), 2011/04/28 17:13:53]

This is what OnPassphraseRequired is for above...  we already added a bool to
that method to distinguish for_decryption.  Is there now a third state?

[Raghu Simha, 2011/04/28 17:44:21]

ProfileSyncServiceHarness::OnStateChanged is called when
SyncFrontend::OnPassphraseAccepted() is triggered by both,
Core::NotifyPassphraseRequired() and by Core::NotifyPassphraseFailed(). The crux
of this patch is that we need a way to differentiate between the two. This is
because in the first case (required), forward progress is possible, while in the
latter case (failed), forward progress is impossible and we must exit early from
AwaitStatusChangeWithTimeout.

+
   virtual void OnEncryptionComplete(
       const syncable::ModelTypeSet& encrypted_types) = 0;