FYI: Control Data + Per-Device Metadata

sync/internal_api/sync_manager_impl.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 SYNC_INTERNAL_API_SYNC_MANAGER_H_
 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 97 matching lines @@
   virtual void AddObserver(SyncManager::Observer* observer) OVERRIDE;
   virtual void RemoveObserver(SyncManager::Observer* observer) OVERRIDE;
   virtual SyncStatus GetDetailedStatus() const OVERRIDE;
   virtual bool IsUsingExplicitPassphrase() OVERRIDE;
   virtual bool GetKeystoreKeyBootstrapToken(std::string* token) OVERRIDE;
   virtual void SaveChanges() OVERRIDE;
   virtual void StopSyncingForShutdown(const base::Closure& callback) OVERRIDE;
   virtual void ShutdownOnSyncThread() OVERRIDE;
   virtual UserShare* GetUserShare() OVERRIDE;
 
-  // Update the Cryptographer from the current nigori node and write back any
-  // necessary changes to the nigori node. We also detect missing encryption
-  // keys and write them into the nigori node.
-  // Also updates or adds the device information into the nigori node.
-  // Note: opens a transaction and can trigger an ON_PASSPHRASE_REQUIRED, so
-  // should only be called after syncapi is fully initialized.
-  // Calls the callback argument with true if cryptographer is ready, false
-  // otherwise.
-  virtual void RefreshNigori(const std::string& chrome_version,
-                             const base::Closure& done_callback) OVERRIDE;
+  virtual void InitialProcessMetadata(
+      const std::string& chrome_version,
+      const base::Closure& done_callback) OVERRIDE;
 
   virtual void EnableEncryptEverything() OVERRIDE;
   virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE;
   virtual bool HasUnsyncedItems() OVERRIDE;
 
   // Return the currently active (validated) username for use with syncable
   // types.
   const std::string& username_for_share() const;
 
   static int GetDefaultNudgeDelay();
@@ skipping 109 matching lines @@
   // ExtraPasswordChangeRecordData field of |buffer|. Otherwise sets
   // |buffer|'s specifics field to contain the unencrypted data.
   void SetExtraChangeRecordData(int64 id,
                                 ModelType type,
                                 ChangeReorderBuffer* buffer,
                                 Cryptographer* cryptographer,
                                 const syncable::EntryKernel& original,
                                 bool existed_before,
                                 bool exists_now);
 
+  // Because the session name must be fetched asynchronously,
+  // InitialProcessMetadata() is split into two parts.  This is the second.
+  void InitialProcessMetadataContinuation(
+      const std::string& chrome_version,
+      const base::Closure& done_callback,
+      const std::string& session_name);
+
+  void UpdateDeviceInformation(const std::string& chrome_version,
+                               const std::string& session_name);
+
   // Stores the current set of encryption keys (if the cryptographer is ready)
   // and encrypted types into the nigori node.
   void UpdateNigoriEncryptionState(Cryptographer* cryptographer,
                                    WriteNode* nigori_node);
 
-  // Internal callback of UpdateCryptographerAndNigoriCallback.
-  void UpdateCryptographerAndNigoriCallback(
-      const std::string& chrome_version,
-      const base::Closure& done_callback,
-      const std::string& session_name);
+  // Updates the cryptographer from the current nigori node.  Informs it of the
+  // most recent passphrase and set of encrypted types (from nigori node), then
+  // ensure all data that needs encryption is encrypted with the appropriate
+  // passphrase.  Then writes this back to the ngiori node.
+  //
+  // May trigger OnPassphraseRequired().  Otherwise, it will trigger
+  // OnEncryptedTypesChanged() if necessary (see comments for
+  // OnEncryptedTypesChanged()), and then OnEncryptionComplete().
+  //
+  // Note: opens a transaction and can trigger an ON_PASSPHRASE_REQUIRED, so
+  // should only be called after syncapi is fully initialized.
+  void UpdateCryptographerAndNigori();
 
   // Updates the nigori node with any new encrypted types and then
   // encrypts the nodes for those new data types as well as other
   // nodes that should be encrypted but aren't.  Triggers
   // OnPassphraseRequired if the cryptographer isn't ready.
   void RefreshEncryption();
 
   void ReEncryptEverything(WriteTransaction* trans);
 
   // The final step of SetEncryptionPassphrase and SetDecryptionPassphrase that
@@ skipping 142 matching lines @@
   // conflict resolver) updated the nigori's encryption keys in this chrome
   // instantiation.
   int nigori_overwrite_count_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_SYNC_MANAGER_H_