[Sync] Cache encrypted types info in ProfileSyncService

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 20214e1409e0311f57a9c0ef55b09b1f8092dffe..64d71c461357b0da8134fa9fbe46294065edda0f 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -210,7 +210,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
       sync_api::PassphraseRequiredReason reason) OVERRIDE;

[Nicolas Zea, 2011/10/20 18:40:41]

I think we may need to send the set of encrypted types here too. Namely, if
another users encrypts new types, we'll receive OnPassphraseRequired but not
OnEncryptionComplete. So we'll think we still have the old set of encrypted
types.

[akalin, 2011/10/21 02:24:17]

Right.  Added new notification OnEncryptedTypesChanged.

   virtual void OnPassphraseAccepted() OVERRIDE;
   virtual void OnEncryptionComplete(
-      const syncable::ModelTypeSet& encrypted_types) OVERRIDE;
+      const syncable::ModelTypeSet& encrypted_types,
+      bool encrypt_everything) OVERRIDE;
   virtual void OnMigrationNeededForTypes(
       const syncable::ModelTypeSet& types) OVERRIDE;
   virtual void OnDataTypesChanged(
@@ -670,6 +671,12 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // is reworked to allow one-shot commands like clearing server data.
   base::OneShotTimer<ProfileSyncService> clear_server_data_timer_;
 
+  // The set of encrypted types and whether or not we want to encrypt
+  // everything.  Initialized on OnBackendInitialized and updated by
+  // OnEncryptionComplete.
+  syncable::ModelTypeSet encrypted_types_;
+  bool encrypt_everything_;
+
   // Whether we're waiting for an attempt to encryption all sync data to
   // complete. We track this at this layer in order to allow the user to cancel
   // if they e.g. don't remember their explicit passphrase.