suppress user/password dialog when re-enabling sync

chrome/browser/sync/sync_prefs.cc

Index: chrome/browser/sync/sync_prefs.cc
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 14a05ea6e1475a5b82eeb42669eaa2ba550c9154..908936c868d512005f4bcb93da4d3c6a04e0ba8c 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -44,6 +44,7 @@ void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
 }
 
 void SyncPrefs::ClearPreferences() {
+  LOG(WARNING) << "ClearPreferences()";
   DCHECK(non_thread_safe_.CalledOnValidThread());
   CHECK(pref_service_);
   pref_service_->ClearPref(prefs::kSyncLastSyncedTime);
@@ -177,6 +178,19 @@ void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) {
   pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token);
 }
 
+std::string SyncPrefs::GetSpareBootstrapToken() const {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  return

[Andrew T Wilson (Slow), 2012/04/03 22:22:33]

uber nit: I'd probably move "pref_service_ ?" up to the same line as the return
statement.

[kochi, 2012/04/03 23:21:48]

Done.

+      pref_service_ ?
+      pref_service_->GetString(prefs::kSyncSpareBootstrapToken) : "";
+}
+
+void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  CHECK(pref_service_);
+  pref_service_->SetString(prefs::kSyncSpareBootstrapToken, token);
+}
+
 sync_notifier::InvalidationVersionMap SyncPrefs::GetAllMaxVersions() const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   if (!pref_service_) {
@@ -398,6 +412,9 @@ void SyncPrefs::RegisterPreferences() {
   pref_service_->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
                                     "",
                                     PrefService::UNSYNCABLE_PREF);
+  pref_service_->RegisterStringPref(prefs::kSyncSpareBootstrapToken,
+                                    "",
+                                    PrefService::UNSYNCABLE_PREF);
 
   // 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