Refactor sync passphrase setup flow and fix passphrase tests

chrome/browser/sync/js_sync_manager_observer_unittest.cc

Index: chrome/browser/sync/js_sync_manager_observer_unittest.cc
diff --git a/chrome/browser/sync/js_sync_manager_observer_unittest.cc b/chrome/browser/sync/js_sync_manager_observer_unittest.cc
index 3631963f0246e2703c989d461373bdd54012283b..f9fa15ddf446d87c789c94de36ab6e0927a605f4 100644
--- a/chrome/browser/sync/js_sync_manager_observer_unittest.cc
+++ b/chrome/browser/sync/js_sync_manager_observer_unittest.cc
@@ -37,10 +37,6 @@ TEST_F(JsSyncManagerObserverTest, NoArgNotifiations) {
               RouteJsEvent("onInitializationComplete",
                            HasArgs(JsArgList()), NULL));
   EXPECT_CALL(mock_router_,
-              RouteJsEvent("onPassphraseFailed",
-                           HasArgs(JsArgList()), NULL));
-
-  EXPECT_CALL(mock_router_,
               RouteJsEvent("onStopSyncingPermanently",
                            HasArgs(JsArgList()), NULL));
   EXPECT_CALL(mock_router_,
@@ -51,7 +47,6 @@ TEST_F(JsSyncManagerObserverTest, NoArgNotifiations) {
                            HasArgs(JsArgList()), NULL));
 
   sync_manager_observer_.OnInitializationComplete();
-  sync_manager_observer_.OnPassphraseFailed();
   sync_manager_observer_.OnStopSyncingPermanently();
   sync_manager_observer_.OnClearServerDataSucceeded();
   sync_manager_observer_.OnClearServerDataFailed();
@@ -116,19 +111,43 @@ TEST_F(JsSyncManagerObserverTest, OnAuthError) {
 TEST_F(JsSyncManagerObserverTest, OnPassphraseRequired) {
   InSequence dummy;
 
-  ListValue true_args, false_args;
-  true_args.Append(Value::CreateBooleanValue(true));
-  false_args.Append(Value::CreateBooleanValue(false));
+  ListValue reason_passphrase_not_required_args;
+  ListValue reason_encryption_args;
+  ListValue reason_decryption_args;
+  ListValue reason_set_passphrase_failed_args;
+
+  reason_passphrase_not_required_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(
+          sync_api::REASON_PASSPHRASE_NOT_REQUIRED)));
+  reason_encryption_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(sync_api::REASON_ENCRYPTION)));
+  reason_decryption_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(sync_api::REASON_DECRYPTION)));
+  reason_set_passphrase_failed_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(
+          sync_api::REASON_SET_PASSPHRASE_FAILED)));
 
   EXPECT_CALL(mock_router_,
               RouteJsEvent("onPassphraseRequired",
-                           HasArgsAsList(false_args), NULL));
+                           HasArgsAsList(reason_passphrase_not_required_args),
+                                         NULL));
   EXPECT_CALL(mock_router_,
               RouteJsEvent("onPassphraseRequired",
-                           HasArgsAsList(true_args), NULL));
-
-  sync_manager_observer_.OnPassphraseRequired(false);
-  sync_manager_observer_.OnPassphraseRequired(true);
+                           HasArgsAsList(reason_encryption_args), NULL));
+  EXPECT_CALL(mock_router_,
+              RouteJsEvent("onPassphraseRequired",
+                           HasArgsAsList(reason_decryption_args), NULL));
+  EXPECT_CALL(mock_router_,
+              RouteJsEvent("onPassphraseRequired",
+                           HasArgsAsList(reason_set_passphrase_failed_args),

[Nicolas Zea, 2011/04/29 22:59:30]

I believe the expectations should be in reverse order, so the first result
expected is set last?

[Raghu Simha, 2011/04/30 00:43:06]

This is fine, based on the in-person conversation we just had :)

+                                         NULL));
+
+  sync_manager_observer_.OnPassphraseRequired(
+      sync_api::REASON_PASSPHRASE_NOT_REQUIRED);
+  sync_manager_observer_.OnPassphraseRequired(sync_api::REASON_ENCRYPTION);
+  sync_manager_observer_.OnPassphraseRequired(sync_api::REASON_DECRYPTION);
+  sync_manager_observer_.OnPassphraseRequired(
+      sync_api::REASON_SET_PASSPHRASE_FAILED);
 }
 
 TEST_F(JsSyncManagerObserverTest, SensitiveNotifiations) {