Refactor sync passphrase setup flow and fix passphrase tests

chrome/browser/sync/sync_ui_util.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/sync_ui_util.h"
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
@@ skipping 85 matching lines @@
   if (!service) {
     return PRE_SYNCED;
   }
 
   if (service->HasSyncSetupCompleted()) {
     ProfileSyncService::Status status(service->QueryDetailedSyncStatus());
     const AuthError& auth_error = service->GetAuthError();
 
     // Either show auth error information with a link to re-login, auth in prog,
     // or note that everything is OK with the last synced time.
-    if (status.authenticated && !service->observed_passphrase_required()) {
+    if (status.authenticated && !service->ObservedPassphraseRequired()) {
       // Everything is peachy.
       if (status_label) {
         status_label->assign(GetSyncedStateStatusLabel(service));
       }
       DCHECK_EQ(auth_error.state(), AuthError::NONE);
     } else if (service->UIShouldDepictAuthInProgress()) {
       if (status_label) {
         status_label->assign(
           l10n_util::GetStringUTF16(IDS_SYNC_AUTHENTICATING_LABEL));
       }
       result_type = PRE_SYNCED;
-    } else if (service->observed_passphrase_required()) {
-      if (service->passphrase_required_for_decryption()) {
+    } else if (service->ObservedPassphraseRequired()) {
+      if (service->passphrase_required_reason() ==
+              sync_api::REASON_DECRYPTION ||
+          service->passphrase_required_reason() ==
+              sync_api::REASON_SET_PASSPHRASE_FAILED) {
         // NOT first machine.
         // Show a link ("needs attention"), but still indicate the
         // current synced status.  Return SYNC_PROMO so that
         // the configure link will still be shown.
         if (status_label && link_label) {
           status_label->assign(GetSyncedStateStatusLabel(service));
           link_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_PASSWORD_SYNC_ATTENTION));
         }
         result_type = SYNC_PROMO;
@@ skipping 50 matching lines @@
 
 // Returns the status info for use on the new tab page, where we want slightly
 // different information than in the settings panel.
 MessageType GetStatusInfoForNewTabPage(ProfileSyncService* service,
                                        string16* status_label,
                                        string16* link_label) {
   DCHECK(status_label);
   DCHECK(link_label);
 
   if (service->HasSyncSetupCompleted() &&
-      service->observed_passphrase_required()) {
-    if (!service->passphrase_required_for_decryption()) {
+      service->ObservedPassphraseRequired()) {
+    if (service->passphrase_required_reason() == sync_api::REASON_ENCRYPTION) {
       // First machine migrating to passwords.  Show as a promotion.
       if (status_label && link_label) {
         status_label->assign(
             l10n_util::GetStringFUTF16(
                 IDS_SYNC_NTP_PASSWORD_PROMO,
                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
         link_label->assign(
             l10n_util::GetStringUTF16(IDS_SYNC_NTP_PASSWORD_ENABLE));
       }
       return SYNC_PROMO;
@@ skipping 231 matching lines @@
 
       DictionaryValue* val = new DictionaryValue;
       val->SetString("stat_name", "Autofill Migration Time");
       val->SetString("stat_value", ConstructTime(info.autofill_migration_time));
       details->Append(val);
     }
   }
 }
 
 }  // namespace sync_ui_util