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..837b2823941527e73b6ea82b44d4288e20ee1479 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -44,11 +44,14 @@ 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);
   pref_service_->ClearPref(prefs::kSyncHasSetupCompleted);
+#if defined(OS_CHROMEOS)
   pref_service_->ClearPref(prefs::kSyncEncryptionBootstrapToken);

[Andrew T Wilson (Slow), 2012/04/03 17:45:13]

Not sure this is right. We should be maintaining the GAIA bootstrap token in a
separate pref and using that when re-enabling sync, rather than maintaining the
old bootstrap token which might contain a token related to a custom passphrase).

[kochi, 2012/04/03 21:55:29]

Made a separate pref to persist another bootstrap token.

On 2012/04/03 17:45:13, Andrew T Wilson wrote:

+#endif
 
   // TODO(nick): The current behavior does not clear
   // e.g. prefs::kSyncBookmarks.  Is that really what we want?