suppress user/password dialog when re-enabling sync

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 26 matching lines @@
   DCHECK(non_thread_safe_.CalledOnValidThread());
   sync_pref_observers_.AddObserver(sync_pref_observer);
 }
 
 void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   sync_pref_observers_.RemoveObserver(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?
 
   pref_service_->ClearPref(prefs::kSyncMaxInvalidationVersions);
 }
 
 bool SyncPrefs::HasSyncSetupCompleted() const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   return
@@ skipping 410 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