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..d169db996dfc90e5dc05911497505553a96e4480 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,37 @@ 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 unknown_args;
+  ListValue encryption_args;
+  ListValue decryption_args;
+  ListValue decryption_failed_args;
+
+  unknown_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(sync_api::UNKNOWN)));
+  encryption_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(sync_api::ENCRYPTION)));
+  decryption_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(sync_api::DECRYPTION)));
+  decryption_failed_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(sync_api::DECRYPTION_FAILED)));
 
   EXPECT_CALL(mock_router_,
               RouteJsEvent("onPassphraseRequired",
-                           HasArgsAsList(false_args), NULL));
+                           HasArgsAsList(unknown_args), NULL));
+  EXPECT_CALL(mock_router_,
+              RouteJsEvent("onPassphraseRequired",
+                           HasArgsAsList(encryption_args), NULL));
+  EXPECT_CALL(mock_router_,
+              RouteJsEvent("onPassphraseRequired",
+                           HasArgsAsList(decryption_args), NULL));
   EXPECT_CALL(mock_router_,
               RouteJsEvent("onPassphraseRequired",
-                           HasArgsAsList(true_args), NULL));
+                           HasArgsAsList(decryption_failed_args), NULL));
 
-  sync_manager_observer_.OnPassphraseRequired(false);
-  sync_manager_observer_.OnPassphraseRequired(true);
+  sync_manager_observer_.OnPassphraseRequired(sync_api::UNKNOWN);

[tim (not reviewing), 2011/04/29 01:21:48]

should add syncapi.h include

[Raghu Simha, 2011/04/29 18:59:14]

It's already included. Line 11.

+  sync_manager_observer_.OnPassphraseRequired(sync_api::ENCRYPTION);
+  sync_manager_observer_.OnPassphraseRequired(sync_api::DECRYPTION);
+  sync_manager_observer_.OnPassphraseRequired(sync_api::DECRYPTION_FAILED);
 }
 
 TEST_F(JsSyncManagerObserverTest, SensitiveNotifiations) {