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

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 155 matching lines @@
 
 std::string SyncPrefs::GetEncryptionBootstrapToken() const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   return
       pref_service_ ?
       pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) : "";
 }
 
 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_) {
     return sync_notifier::InvalidationVersionMap();
   }
   // Complicated gross code to convert from a string -> string
   // DictionaryValue to a ModelType -> int64 map.
   const base::DictionaryValue* max_versions_dict =
       pref_service_->GetDictionary(prefs::kSyncMaxInvalidationVersions);
   CHECK(max_versions_dict);
@@ skipping 201 matching lines @@
     }
     RegisterDataTypePreferredPref(type, enable_by_default);
   }
 
   pref_service_->RegisterBooleanPref(prefs::kSyncManaged,
                                      false,
                                      PrefService::UNSYNCABLE_PREF);
   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
   // already acknowledged.
   syncable::ModelTypeSet model_set;
   model_set.Put(syncable::BOOKMARKS);
   model_set.Put(syncable::PREFERENCES);
   model_set.Put(syncable::PASSWORDS);
   model_set.Put(syncable::AUTOFILL_PROFILE);
   model_set.Put(syncable::AUTOFILL);
@@ skipping 61 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