Add method IsPassphraseRequiredForDecryption to ProfileSyncService

chrome/browser/sync/profile_sync_service_harness.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/profile_sync_service_harness.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <iterator>
 #include <ostream>
@@ skipping 253 matching lines @@
       }
       timestamp_match_partner_->service()->RemoveObserver(this);
       timestamp_match_partner_ = NULL;
 
       SignalStateCompleteWithNextState(FULLY_SYNCED);
       break;
     }
     case WAITING_FOR_PASSPHRASE_ACCEPTED: {
       LogClientInfo("WAITING_FOR_PASSPHRASE_ACCEPTED");
       if (service()->ShouldPushChanges() &&
-          !service()->ObservedPassphraseRequired()) {
+          !service()->IsPassphraseRequired()) {
         // The passphrase has been accepted, and sync has been restarted.
         SignalStateCompleteWithNextState(FULLY_SYNCED);
       }
       break;
     }
     case WAITING_FOR_ENCRYPTION: {
       LogClientInfo("WAITING_FOR_ENCRYPTION");
       if (IsTypeEncrypted(waiting_for_encryption_type_)) {
         // Encryption is complete for the type we are waiting on.
         SignalStateCompleteWithNextState(FULLY_SYNCED);
@@ skipping 46 matching lines @@
 }
 
 bool ProfileSyncServiceHarness::AwaitPassphraseAccepted() {
   LogClientInfo("AwaitPassphraseAccepted");
   if (wait_state_ == SYNC_DISABLED) {
     LOG(ERROR) << "Sync disabled for Client " << id_ << ".";
     return false;
   }
 
   if (service()->ShouldPushChanges() &&
-      !service()->ObservedPassphraseRequired()) {
+      !service()->IsPassphraseRequired()) {
     // Passphrase is already accepted; don't wait.
     return true;
   }
 
   wait_state_ = WAITING_FOR_PASSPHRASE_ACCEPTED;
   return AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs,
                                       "Waiting for passphrase accepted.");
 }
 
 bool ProfileSyncServiceHarness::AwaitBackendInitialized() {
@@ skipping 165 matching lines @@
   const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
   // TODO(rsimha): Remove additional checks of snap->has_more_to_sync and
   // snap->unsynced_count once http://crbug.com/48989 is fixed.
   return (snap &&
           snap->num_conflicting_updates == 0 &&  // We can decrypt everything.
           ServiceIsPushingChanges() &&
           GetStatus().notifications_enabled &&
           !service()->HasUnsyncedItems() &&
           !snap->has_more_to_sync &&
           snap->unsynced_count == 0 &&
-          !service()->HasPendingBackendMigration());
+          !service()->HasPendingBackendMigration() &&
+          service()->passphrase_required_reason() !=
+              sync_api::REASON_SET_PASSPHRASE_FAILED);
 }
 
 bool ProfileSyncServiceHarness::MatchesOtherClient(
     ProfileSyncServiceHarness* partner) {
   if (!IsSynced())
     return false;
 
   // Only look for a match if we have at least one enabled datatype in
   // common with the partner client.
   syncable::ModelTypeSet types, other_types, intersection_types;
@@ skipping 114 matching lines @@
     const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
     if (snap) {
       VLOG(0) << "Client " << id_ << ": " << message
               << ": num_updates_downloaded : "
               << snap->syncer_status.num_updates_downloaded_total
               << ", has_more_to_sync: " << snap->has_more_to_sync
               << ", unsynced_count: " << snap->unsynced_count
               << ", num_conflicting_updates: " << snap->num_conflicting_updates
               << ", has_unsynced_items: "
               << service()->HasUnsyncedItems()
-              << ", observed_passphrase_required: "
-              << service()->ObservedPassphraseRequired()
+              << ", passphrase_required_reason: "
+              << sync_api::PassphraseRequiredReasonToString(
+                    service()->passphrase_required_reason())
               << ", notifications_enabled: "
               << GetStatus().notifications_enabled
               << ", service_is_pushing_changes: " << ServiceIsPushingChanges()
               << ", has_pending_backend_migration: "
               << service()->HasPendingBackendMigration();
     } else {
       VLOG(0) << "Client " << id_ << ": " << message
               << ": Sync session snapshot not available.";
     }
   } else {
@@ skipping 35 matching lines @@
   return true;
 }
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::Write(&value, true, &service_status);
   return service_status;
 }