summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/syncable/syncable.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/syncable/syncable.cc')
-rw-r--r--chrome/browser/sync/syncable/syncable.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index bc12516..ce2d8bf 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -94,6 +94,7 @@ bool VerifyReferenceIntegrityUnsafe(const syncable::MetahandlesIndex &index) {
} // namespace
using std::string;
+using browser_sync::Encryptor;
using browser_sync::ReportUnrecoverableErrorFunction;
using browser_sync::UnrecoverableErrorHandler;
@@ -514,9 +515,11 @@ Directory::Kernel::~Kernel() {
}
Directory::Directory(
+ Encryptor* encryptor,
UnrecoverableErrorHandler* unrecoverable_error_handler,
ReportUnrecoverableErrorFunction report_unrecoverable_error_function)
- : kernel_(NULL),
+ : cryptographer_(encryptor),
+ kernel_(NULL),
store_(NULL),
unrecoverable_error_handler_(unrecoverable_error_handler),
report_unrecoverable_error_function_(