[Sync] Refactor GetEncryptedTypes usage.

sync/test/fake_sync_encryption_handler.h

 // Copyright (c) 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 SYNC_SYNCABLE_TEST_FAKE_SYNC_ENCRYPTION_HANDLER_H_
 #define SYNC_SYNCABLE_TEST_FAKE_SYNC_ENCRYPTION_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "sync/internal_api/public/sync_encryption_handler.h"
 #include "sync/syncable/nigori_handler.h"
+#include "sync/test/fake_encryptor.h"
+#include "sync/util/cryptographer.h"
 
 namespace syncer {
 
-class Cryptographer;
-
 // A fake sync encryption handler capable of keeping track of the encryption
 // state without opening any transactions or interacting with the nigori node.
 // Note that this only performs basic interactions with the cryptographer
 // (setting pending keys, installing keys).
 // Note: NOT thread safe. If threads attempt to check encryption state
 // while another thread is modifying it, races can occur.
 class FakeSyncEncryptionHandler : public SyncEncryptionHandler,
                                   public syncable::NigoriHandler {
  public:
   FakeSyncEncryptionHandler();
   virtual ~FakeSyncEncryptionHandler();
 
-  void set_cryptographer(Cryptographer* cryptographer) {
-    cryptographer_ = cryptographer;
-  }
-
   // SyncEncryptionHandler implementation.
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual void Init() OVERRIDE;
   virtual void SetEncryptionPassphrase(const std::string& passphrase,
                                        bool is_explicit) OVERRIDE;
   virtual void SetDecryptionPassphrase(const std::string& passphrase) OVERRIDE;
   virtual void EnableEncryptEverything() OVERRIDE;
   virtual bool EncryptEverythingEnabled() const OVERRIDE;
   virtual bool IsUsingExplicitPassphrase() const OVERRIDE;
 
   // NigoriHandler implemenation.
   virtual void ApplyNigoriUpdate(
       const sync_pb::NigoriSpecifics& nigori,
       syncable::BaseTransaction* const trans) OVERRIDE;
-  virtual ModelTypeSet GetEncryptedTypes() const OVERRIDE;
   virtual void UpdateNigoriFromEncryptedTypes(
       sync_pb::NigoriSpecifics* nigori,
       syncable::BaseTransaction* const trans) const OVERRIDE;
+  virtual ModelTypeSet GetEncryptedTypes(
+      syncable::BaseTransaction* const trans) const OVERRIDE;
+
+  Cryptographer* cryptographer() { return &cryptographer_; }
 
  private:
   ObserverList<SyncEncryptionHandler::Observer> observers_;
   ModelTypeSet encrypted_types_;
   bool encrypt_everything_;
   bool explicit_passphrase_;
 
-  Cryptographer* cryptographer_;
+  FakeEncryptor encryptor_;
+  Cryptographer cryptographer_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_TEST_FAKE_SYNC_ENCRYPTION_HANDLER_H_