[Sync] Initial support for encrypting any datatype (no UI hookup yet).

chrome/test/live_sync/two_client_live_sessions_sync_test.cc

Index: chrome/test/live_sync/two_client_live_sessions_sync_test.cc
diff --git a/chrome/test/live_sync/two_client_live_sessions_sync_test.cc b/chrome/test/live_sync/two_client_live_sessions_sync_test.cc
index 7294c07f36e9cb2d9bd9d1efc333514ab2152c06..86f97cf266fbcefed67242dfd03670c3a74d93ea 100644
--- a/chrome/test/live_sync/two_client_live_sessions_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_sessions_sync_test.cc
@@ -6,7 +6,7 @@
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/test/live_sync/live_sessions_sync_test.h"
 
-// @TODO(zea): Test each individual session command we care about separately.
+// TODO(zea): Test each individual session command we care about separately.
 // (as well as multi-window). We're currently only checking basic single-window/
 // single-tab functionality.
 
@@ -31,6 +31,56 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest, SingleClientChanged) {
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));
 }
 
+IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
+                       SingleClientEnabledEncryption) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  ASSERT_TRUE(EnableEncryption(0));
+  GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
+  ASSERT_TRUE(IsEncrypted(0));
+  ASSERT_TRUE(IsEncrypted(1));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
+                       SingleClientEnabledEncryptionAndChanged) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  std::vector<SessionWindow*>* client0_windows =
+      InitializeNewWindowWithTab(0, GURL("about:bubba"));
+  ASSERT_TRUE(client0_windows);
+  ASSERT_TRUE(EnableEncryption(0));
+  GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
+
+  // Get foreign session data from client 1.
+  ASSERT_TRUE(IsEncrypted(1));
+  std::vector<const ForeignSession*> sessions1;
+  ASSERT_TRUE(GetSessionData(1, &sessions1));
+
+  // Verify client 1's foreign session matches client 0 current window.
+  ASSERT_EQ(1U, sessions1.size());
+  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
+                       BothClientsEnabledEncryption) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  ASSERT_TRUE(EnableEncryption(0));
+  ASSERT_TRUE(EnableEncryption(1));
+  GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
+  ASSERT_TRUE(IsEncrypted(0));
+  ASSERT_TRUE(IsEncrypted(1));

[Raghu Simha, 2011/02/14 05:29:52]

It's really nice to see a bunch of new tests where almost every line is an
ASSERT_. Makes for very readable tests, and very readable logs in case of a
failure.

[Nicolas Zea, 2011/02/14 21:18:41]

Done.

+}
+
 IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest, BothChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";