| Index: sync/internal_api/test/fake_sync_manager.cc
|
| diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc
|
| index 696746d33f6b637e31b5b4fb7be781d28ca833c3..55d663b53567c98b7afb66ee010b429858c82fbe 100644
|
| --- a/sync/internal_api/test/fake_sync_manager.cc
|
| +++ b/sync/internal_api/test/fake_sync_manager.cc
|
| @@ -18,10 +18,13 @@
|
| #include "sync/notifier/notifications_disabled_reason.h"
|
| #include "sync/notifier/object_id_payload_map.h"
|
| #include "sync/notifier/sync_notifier.h"
|
| +#include "sync/test/fake_sync_encryption_handler.h"
|
|
|
| namespace syncer {
|
|
|
| -FakeSyncManager::FakeSyncManager() {}
|
| +FakeSyncManager::FakeSyncManager() {
|
| + fake_encryption_handler_.reset(new FakeSyncEncryptionHandler());
|
| +}
|
|
|
| FakeSyncManager::~FakeSyncManager() {}
|
|
|
| @@ -159,15 +162,6 @@ void FakeSyncManager::StartSyncingNormally(
|
| // Do nothing.
|
| }
|
|
|
| -void FakeSyncManager::SetEncryptionPassphrase(const std::string& passphrase,
|
| - bool is_explicit) {
|
| - NOTIMPLEMENTED();
|
| -}
|
| -
|
| -void FakeSyncManager::SetDecryptionPassphrase(const std::string& passphrase) {
|
| - NOTIMPLEMENTED();
|
| -}
|
| -
|
| void FakeSyncManager::ConfigureSyncer(
|
| ConfigureReason reason,
|
| const ModelTypeSet& types_to_config,
|
| @@ -214,11 +208,6 @@ SyncStatus FakeSyncManager::GetDetailedStatus() const {
|
| return SyncStatus();
|
| }
|
|
|
| -bool FakeSyncManager::IsUsingExplicitPassphrase() {
|
| - NOTIMPLEMENTED();
|
| - return false;
|
| -}
|
| -
|
| bool FakeSyncManager::GetKeystoreKeyBootstrapToken(std::string* token) {
|
| return false;
|
| }
|
| @@ -238,19 +227,9 @@ void FakeSyncManager::ShutdownOnSyncThread() {
|
| }
|
|
|
| UserShare* FakeSyncManager::GetUserShare() {
|
| - NOTIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| -void FakeSyncManager::RefreshNigori(const std::string& chrome_version,
|
| - const base::Closure& done_callback) {
|
| - done_callback.Run();
|
| -}
|
| -
|
| -void FakeSyncManager::EnableEncryptEverything() {
|
| - NOTIMPLEMENTED();
|
| -}
|
| -
|
| bool FakeSyncManager::ReceivedExperiment(Experiments* experiments) {
|
| return false;
|
| }
|
| @@ -260,6 +239,10 @@ bool FakeSyncManager::HasUnsyncedItems() {
|
| return false;
|
| }
|
|
|
| +SyncEncryptionHandler* FakeSyncManager::GetEncryptionHandler() {
|
| + return fake_encryption_handler_.get();
|
| +}
|
| +
|
| void FakeSyncManager::InvalidateOnSyncThread(
|
| const ObjectIdPayloadMap& id_payloads,
|
| IncomingNotificationSource source) {
|
|
|