Refactor sync passphrase setup flow and fix passphrase tests

chrome/browser/sync/js_sync_manager_observer_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/js_sync_manager_observer.h"
 
 #include <cstddef>
 
 #include "base/basictypes.h"
 #include "base/values.h"
@@ skipping 19 matching lines @@
   JsSyncManagerObserver sync_manager_observer_;
 };
 
 TEST_F(JsSyncManagerObserverTest, NoArgNotifiations) {
   InSequence dummy;
 
   EXPECT_CALL(mock_router_,
               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_,
               RouteJsEvent("onClearServerDataSucceeded",
                            HasArgs(JsArgList()), NULL));
   EXPECT_CALL(mock_router_,
               RouteJsEvent("onClearServerDataFailed",
                            HasArgs(JsArgList()), NULL));
 
   sync_manager_observer_.OnInitializationComplete();
-  sync_manager_observer_.OnPassphraseFailed();
   sync_manager_observer_.OnStopSyncingPermanently();
   sync_manager_observer_.OnClearServerDataSucceeded();
   sync_manager_observer_.OnClearServerDataFailed();
 }
 
 TEST_F(JsSyncManagerObserverTest, OnChangesComplete) {
   InSequence dummy;
 
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
        i < syncable::MODEL_TYPE_COUNT; ++i) {
@@ skipping 44 matching lines @@
   EXPECT_CALL(mock_router_,
               RouteJsEvent("onAuthError",
                            HasArgsAsList(expected_args), NULL));
 
   sync_manager_observer_.OnAuthError(error);
 }
 
 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));

[akalin, 2011/05/02 18:02:53]

indentation (NULL should line up with "OnPassphraseRequired").

[Raghu Simha, 2011/05/02 18:20:05]

Nice catch. Done.

   EXPECT_CALL(mock_router_,
               RouteJsEvent("onPassphraseRequired",
-                           HasArgsAsList(true_args), NULL));
+                           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),
+                                         NULL));

[akalin, 2011/05/02 18:02:53]

here, too

[Raghu Simha, 2011/05/02 18:20:05]

Done.

 
-  sync_manager_observer_.OnPassphraseRequired(false);
-  sync_manager_observer_.OnPassphraseRequired(true);
+  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) {
   ListValue redacted_args;
   redacted_args.Append(Value::CreateStringValue("<redacted>"));
 
   EXPECT_CALL(mock_router_,
               RouteJsEvent("onUpdatedToken",
                            HasArgsAsList(redacted_args), NULL));
   EXPECT_CALL(mock_router_,
@@ skipping 129 matching lines @@
     sync_manager_observer_.OnChangesApplied(syncable::ModelTypeFromInt(i),
                                             &trans, &changes[i],
                                             syncable::MODEL_TYPE_COUNT - i);
   }
 
   test_user_share.TearDown();
 }
 
 }  // namespace
 }  // namespace browser_sync