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

Unified Diff: sync/tools/sync_client.cc

Issue 10540149: [Sync] Persist keystore key across restarts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix rebase Created 8 years, 5 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
« no previous file with comments | « sync/internal_api/test/fake_sync_manager.cc ('k') | sync/util/cryptographer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/tools/sync_client.cc
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index 357b69412b346a3ba582e790838399357ac3e49c..8e47287d5983905a874cd9d87a9c7abfb289f805 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -345,6 +345,7 @@ int SyncClientMain(int argc, char* argv[]) {
ExtensionsActivityMonitor* extensions_activity_monitor = NULL;
LoggingChangeDelegate change_delegate;
const char kRestoredKeyForBootstrapping[] = "";
+ const char kRestoredKeystoreKeyForBootstrapping[] = "";
NullEncryptor null_encryptor;
LoggingUnrecoverableErrorHandler unrecoverable_error_handler;
sync_manager->Init(database_dir.path(),
@@ -362,6 +363,7 @@ int SyncClientMain(int argc, char* argv[]) {
scoped_ptr<SyncNotifier>(
sync_notifier_factory.CreateSyncNotifier()),
kRestoredKeyForBootstrapping,
+ kRestoredKeystoreKeyForBootstrapping,
true, // enable keystore encryption
scoped_ptr<InternalComponentsFactory>(
new InternalComponentsFactoryImpl()),
« no previous file with comments | « sync/internal_api/test/fake_sync_manager.cc ('k') | sync/util/cryptographer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698