[Sync] Persist keystore key across restarts

chrome/browser/sync/sync_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ skipping 34 matching lines @@
   DCHECK(non_thread_safe_.CalledOnValidThread());
   sync_pref_observers_.RemoveObserver(sync_pref_observer);
 }
 
 void SyncPrefs::ClearPreferences() {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   CHECK(pref_service_);
   pref_service_->ClearPref(prefs::kSyncLastSyncedTime);
   pref_service_->ClearPref(prefs::kSyncHasSetupCompleted);
   pref_service_->ClearPref(prefs::kSyncEncryptionBootstrapToken);
+  pref_service_->ClearPref(prefs::kSyncKeystoreEncryptionBootstrapToken);
 
   // TODO(nick): The current behavior does not clear
   // e.g. prefs::kSyncBookmarks.  Is that really what we want?
 }
 
 bool SyncPrefs::HasSyncSetupCompleted() const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   return
       pref_service_ &&
       pref_service_->GetBoolean(prefs::kSyncHasSetupCompleted);
@@ skipping 105 matching lines @@
   return
       pref_service_ ?
       pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) : "";
 }
 
 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token);
 }
 
+std::string SyncPrefs::GetKeystoreEncryptionBootstrapToken() const {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  return
+      pref_service_ ?
+      pref_service_->GetString(prefs::kSyncKeystoreEncryptionBootstrapToken) :
+      "";
+}
+
+void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  pref_service_->SetString(prefs::kSyncKeystoreEncryptionBootstrapToken, token);
+}
+
 #if defined(OS_CHROMEOS)
 std::string SyncPrefs::GetSpareBootstrapToken() const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   return pref_service_ ?
       pref_service_->GetString(prefs::kSyncSpareBootstrapToken) : "";
 }
 
 void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   pref_service_->SetString(prefs::kSyncSpareBootstrapToken, token);
@@ skipping 147 matching lines @@
     }
     RegisterDataTypePreferredPref(type, enable_by_default);
   }
 
   pref_service_->RegisterBooleanPref(prefs::kSyncManaged,
                                      false,
                                      PrefService::UNSYNCABLE_PREF);
   pref_service_->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
                                     "",
                                     PrefService::UNSYNCABLE_PREF);
+  pref_service_->RegisterStringPref(
+      prefs::kSyncKeystoreEncryptionBootstrapToken,
+      "",
+      PrefService::UNSYNCABLE_PREF);
 #if defined(OS_CHROMEOS)
   pref_service_->RegisterStringPref(prefs::kSyncSpareBootstrapToken,
                                     "",
                                     PrefService::UNSYNCABLE_PREF);
 #endif
 
   // We will start prompting people about new data types after the launch of
   // SESSIONS - all previously launched data types are treated as if they are
   // already acknowledged.
   syncable::ModelTypeSet model_set;
@@ skipping 63 matching lines @@
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
     else
       types_with_groups.RemoveAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
 
 }  // namespace browser_sync