[sync] Apply sync config changes only after sync backend is initialized

chrome/browser/sync/credential_cache_service_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_CREDENTIAL_CACHE_SERVICE_WIN_H_
 #define CHROME_BROWSER_SYNC_CREDENTIAL_CACHE_SERVICE_WIN_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 43 matching lines @@
 
   // Loads cached sync credentials from the alternate profile and applies them
   // to the local profile if the load was successful.
   void ReadCachedCredentialsFromAlternateProfile();
 
   // Writes kSyncKeepEverythingSynced and the sync preferences for individual
   // datatypes to the local cache.
   void WriteSyncPrefsToLocalCache();
 
   // Resets |alternate_store_| and schedules the next read from the alternate
-  // credential cache.
-  void ScheduleNextReadFromAlternateCredentialCache();
+  // credential cache in |delay_secs| seconds.
+  void ScheduleNextReadFromAlternateCredentialCache(int delay_secs);
 
  protected:
   // Returns true if the credential cache represented by |store| contains a
   // value for |pref_name|.
   bool HasPref(scoped_refptr<JsonPrefStore> store,
                const std::string& pref_name);
 
   // Encrypts and base 64 encodes |credential|, converts the result to a
   // StringValue, and returns the result. Caller owns the StringValue returned.
   static base::StringValue* PackCredential(const std::string& credential);
@@ skipping 146 matching lines @@
   void UpdateTokenServiceCredentials(const std::string& alternate_lsid,
                                      const std::string& alternate_sid);
 
   // Initiates a sign out of sync. Called when we notice that the user has
   // signed out from the alternate mode by reading its credential cache.
   void InitiateSignOut();
 
   // Compares the sync preferences in the local profile with values that were
   // read from the alternate profile -- |alternate_keep_everything_synced| and
   // |alternate_preferred_types|. Returns true if the prefs have changed, and
-  // false otherwise.
+  // false otherwise. Note: Differences in preferred_types are ignored if the
+  // alternate and local values of keep_everything_synced are both true.
   bool HaveSyncPrefsChanged(bool alternate_keep_everything_synced,
                             ModelTypeSet alternate_preferred_types) const;
 
   // Compares the sync encryption tokens in the local profile with values that
   // were read from the alternate profile --
   // |alternate_encryption_bootstrap_token| and
   // |alternate_keystore_encryption_bootstrap_token|. Returns true if the tokens
   // have changed, and false otherwise.
   bool HaveSyncEncryptionTokensChanged(
       const std::string& alternate_encryption_bootstrap_token,
@@ skipping 66 matching lines @@
   // Used to make sure that there is always at most one future read scheduled
   // on the alternate credential cache.
   base::CancelableClosure next_read_;
 
   DISALLOW_COPY_AND_ASSIGN(CredentialCacheService);
 };
 
 }  // namespace syncer
 
 #endif  // CHROME_BROWSER_SYNC_CREDENTIAL_CACHE_SERVICE_WIN_H_