[Sync] Persist keystore key across restarts

chrome/browser/sync/glue/sync_backend_host.h

Index: chrome/browser/sync/glue/sync_backend_host.h
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index e72513b5aba715f22e2af4f773d499bbd6f84075..d4a7f401704ce721684ad0cb5a3592151c69637b 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -301,6 +301,7 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
         sync_notifier::SyncNotifierFactory* sync_notifier_factory,
         bool delete_sync_data_folder,
         const std::string& restored_key_for_bootstrapping,
+        const std::string& restored_keystore_key_for_bootstrapping,
         sync_api::SyncManager::TestingMode testing_mode,
         UnrecoverableErrorHandler* unrecoverable_error_handler,
         ReportUnrecoverableErrorFunction report_unrecoverable_error_function);
@@ -321,6 +322,7 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
     std::string lsid;
     bool delete_sync_data_folder;
     std::string restored_key_for_bootstrapping;
+    std::string restored_keystore_key_for_bootstrapping;
     sync_api::SyncManager::TestingMode testing_mode;
     UnrecoverableErrorHandler* unrecoverable_error_handler;
     ReportUnrecoverableErrorFunction report_unrecoverable_error_function;
@@ -340,6 +342,7 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
 
   // Called when the syncer has finished performing a configuration.
   void FinishConfigureDataTypesOnFrontendLoop(
+    const std::string& keystore_bootstrap_token,
     const syncable::ModelTypeSet& types_to_configure,
     const syncable::ModelTypeSet& configured_types,
     const base::Callback<void(syncable::ModelTypeSet)>& ready_task);