[Sync] Add intelligent re-encryption support.

chrome/browser/sync/internal_api/base_node.h

Index: chrome/browser/sync/internal_api/base_node.h
diff --git a/chrome/browser/sync/internal_api/base_node.h b/chrome/browser/sync/internal_api/base_node.h
index 362fdc39d98c0a1b78afbcc344f1893fcb612d9d..05271d998f5edb8229c08c2cc9909eb07bc757e5 100644
--- a/chrome/browser/sync/internal_api/base_node.h
+++ b/chrome/browser/sync/internal_api/base_node.h
@@ -208,6 +208,11 @@ class BaseNode {
   void SetUnencryptedSpecifics(const sync_pb::EntitySpecifics& specifics);
 
  private:
+  friend class SyncApiTest;

[akalin, 2011/12/06 18:28:02]

i think the 'friend class' declarations are unnecessary

[Nicolas Zea, 2011/12/06 20:45:36]

One of them is, the other not. The FREIND_TEST_ALL... only friend the test
methods themselves, which doesn't apply to the test class members.

[akalin, 2011/12/09 23:52:42]

Ah, right, can you add a comment explaining why the class needs to be friended?

[Nicolas Zea, 2011/12/12 20:12:26]

Done.

+  FRIEND_TEST_ALL_PREFIXES(SyncApiTest, GenerateSyncableHash);
+  friend class SyncManagerTest;
+  FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, UpdateEntryWithEncryption);
+
   void* operator new(size_t size);  // Node is meant for stack use only.
 
   // A holder for the unencrypted data stored in an encrypted node.
@@ -216,9 +221,6 @@ class BaseNode {
   // Same as |unencrypted_data_|, but for legacy password encryption.
   scoped_ptr<sync_pb::PasswordSpecificsData> password_data_;
 
-  friend class SyncApiTest;
-  FRIEND_TEST_ALL_PREFIXES(SyncApiTest, GenerateSyncableHash);
-
   DISALLOW_COPY_AND_ASSIGN(BaseNode);
 };