Merge 130722 - On ChromeOS, the user is always signed in and we should not

chrome/browser/sync/sync_prefs.cc

Index: chrome/browser/sync/sync_prefs.cc
===================================================================
--- chrome/browser/sync/sync_prefs.cc	(revision 131686)
+++ chrome/browser/sync/sync_prefs.cc	(working copy)
@@ -173,10 +173,22 @@
 
 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
-  CHECK(pref_service_);
   pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, 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);
+}
+#endif
+
 sync_notifier::InvalidationVersionMap SyncPrefs::GetAllMaxVersions() const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   if (!pref_service_) {
@@ -398,6 +410,11 @@
   pref_service_->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
                                     "",
                                     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