Fix some problems with the ENTER_PASSPHRASE state in sync setup....

chrome/browser/sync/sync_ui_util.cc

Index: chrome/browser/sync/sync_ui_util.cc
===================================================================
--- chrome/browser/sync/sync_ui_util.cc	(revision 62569)
+++ chrome/browser/sync/sync_ui_util.cc	(working copy)
@@ -87,7 +87,7 @@
 
     // 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) {
+    if (status.authenticated && !service->observed_passphrase_required()) {
       // Everything is peachy.
       if (status_label) {
         status_label->assign(GetSyncedStateStatusLabel(service));
@@ -99,7 +99,8 @@
           l10n_util::GetStringUTF16(IDS_SYNC_AUTHENTICATING_LABEL));
       }
       result_type = PRE_SYNCED;
-    } else if (auth_error.state() != AuthError::NONE) {
+    } else if (auth_error.state() != AuthError::NONE ||
+               service->observed_passphrase_required()) {
       if (status_label && link_label) {
         GetStatusLabelsForAuthError(auth_error, service,
                                     status_label, link_label);