Refactor sync passphrase setup flow and fix passphrase tests

chrome/browser/sync/profile_sync_service_harness.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 154 matching lines @@
     WAITING_FOR_PASSPHRASE_ACCEPTED,
 
     // The sync client anticipates encryption of new datatypes.
     WAITING_FOR_ENCRYPTION,
 
     // The sync client is waiting for the datatype manager to be configured and
     // for sync to be fully initialized. Used after a browser restart, where a
     // full sync cycle is not expected to occur.
     WAITING_FOR_SYNC_CONFIGURATION,
 
+    // The sync client needs a passphrase in order to decrypt data.
+    PASSPHRASE_REQUIRED_FOR_DECRYPTION,
+
     // The sync client cannot reach the server.
     SERVER_UNREACHABLE,
 
     // The sync client is fully synced and there are no pending updates.
     FULLY_SYNCED,
 
     // Syncing is disabled for the client.
     SYNC_DISABLED,
 
     NUMBER_OF_STATES,
@@ skipping 27 matching lines @@
   // for a particular datatype.
   std::string GetUpdatedTimestamp(syncable::ModelType model_type);
 
   // Gets the status from |service_| in pretty printable form.
   std::string GetServiceStatus();
 
   // When in WAITING_FOR_ENCRYPTION state, we check to see if this type is now
   // encrypted to determine if we're done.
   syncable::ModelType waiting_for_encryption_type_;
 
+  // The WaitState in which the sync client currently is. Helps determine what
+  // action to take when RunStateChangeMachine() is called.
   WaitState wait_state_;
 
+  // Sync profile associated with this sync client.
   Profile* profile_;
+
+  // ProfileSyncService object associated with |profile_|.
   ProfileSyncService* service_;
 
   // The harness of the client whose update progress marker we're expecting
   // eventually match.
   ProfileSyncServiceHarness* timestamp_match_partner_;
 
   // Credentials used for GAIA authentication.
   std::string username_;
   std::string password_;
 
   // Client ID, used for logging purposes.
   int id_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceHarness);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_