[Sync] Adding integration tests for USS encryption and fixing a worker bug.

components/sync/engine/sync_encryption_handler.h

 // Copyright 2012 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 COMPONENTS_SYNC_ENGINE_SYNC_ENCRYPTION_HANDLER_H_
 #define COMPONENTS_SYNC_ENGINE_SYNC_ENCRYPTION_HANDLER_H_
 
 #include <string>
 
 #include "base/time/time.h"
@@ skipping 44 matching lines @@
     // - If the passphrase is required for the decryption of data that has
     //   already been encrypted, |reason| will be REASON_DECRYPTION.
     // - If the passphrase is required because decryption failed, and a new
     //   passphrase is required, |reason| will be REASON_SET_PASSPHRASE_FAILED.
     //
     // |pending_keys| is a copy of the cryptographer's pending keys, that may be
     // cached by the frontend for subsequent use by the UI.
     virtual void OnPassphraseRequired(
         PassphraseRequiredReason reason,
         const sync_pb::EncryptedData& pending_keys) = 0;
+
     // Called when the passphrase provided by the user has been accepted and is
     // now used to encrypt sync data.
+    virtual void OnPassphraseAccepted() = 0;
 
-    virtual void OnPassphraseAccepted() = 0;
     // |bootstrap_token| is an opaque base64 encoded representation of the key
     // generated by the current passphrase, and is provided to the observer for
     // persistence purposes and use in a future initialization of sync (e.g.
     // after restart). The boostrap token will always be derived from the most
     // recent GAIA password (for accounts with implicit passphrases), even if
     // the data is still encrypted with an older GAIA password. For accounts
     // with explicit passphrases, it will be the most recently seen custom
     // passphrase.
     virtual void OnBootstrapTokenUpdated(const std::string& bootstrap_token,
                                          BootstrapTokenType type) = 0;
@@ skipping 87 matching lines @@
   // types are encrypted.
   virtual bool IsEncryptEverythingEnabled() const = 0;
 
   // The set of types that are always encrypted.
   static ModelTypeSet SensitiveTypes();
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_SYNC_ENCRYPTION_HANDLER_H_