[Sync] Add intelligent re-encryption support.

chrome/browser/sync/internal_api/base_node.h

 // Copyright (c) 2011 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_INTERNAL_API_BASE_NODE_H_
 #define CHROME_BROWSER_SYNC_INTERNAL_API_BASE_NODE_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 190 matching lines @@
   // Returns the unencrypted specifics associated with |entry|. If |entry| was
   // not encrypted, it directly returns |entry|'s EntitySpecifics. Otherwise,
   // returns |unencrypted_data_|.
   const sync_pb::EntitySpecifics& GetUnencryptedSpecifics(
       const syncable::Entry* entry) const;
 
   // Copy |specifics| into |unencrypted_data_|.
   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.
   sync_pb::EntitySpecifics unencrypted_data_;
 
   // 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);
 };
 
 }  // namespace sync_api
 
 #endif  // CHROME_BROWSER_SYNC_INTERNAL_API_BASE_NODE_H_