Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: sync/test/engine/test_directory_setter_upper.h

Issue 10844005: [Sync] Refactor GetEncryptedTypes usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always trigger OnEncryptedTypesChanged on init Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/test/engine/test_directory_setter_upper.h
diff --git a/sync/test/engine/test_directory_setter_upper.h b/sync/test/engine/test_directory_setter_upper.h
index b4920646916248040688235ed8ff6bf27985f306..5dbce2d6cc5397d660f0622376da5cf81da9adf4 100644
--- a/sync/test/engine/test_directory_setter_upper.h
+++ b/sync/test/engine/test_directory_setter_upper.h
@@ -35,7 +35,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/scoped_temp_dir.h"
-#include "sync/test/fake_encryptor.h"
+#include "sync/test/fake_sync_encryption_handler.h"
#include "sync/test/null_directory_change_delegate.h"
#include "sync/util/test_unrecoverable_error_handler.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -61,6 +61,8 @@ class TestDirectorySetterUpper {
syncable::Directory* directory() { return directory_.get(); }
+ SyncEncryptionHandler* encryption_handler() { return &encryption_handler_; }
+
private:
syncable::NullDirectoryChangeDelegate delegate_;
TestUnrecoverableErrorHandler handler_;
@@ -68,7 +70,7 @@ class TestDirectorySetterUpper {
void RunInvariantCheck();
ScopedTempDir temp_dir_;
- FakeEncryptor encryptor_;
+ FakeSyncEncryptionHandler encryption_handler_;
scoped_ptr<syncable::Directory> directory_;
std::string name_;

Powered by Google App Engine
This is Rietveld 408576698