[Sync] Fixing two bugs in the worker revealed by trying to add an encryption integration test.

chrome/browser/sync/test/integration/two_client_uss_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
index 8b861258508535dc1c9f7dcdb61faa9a0046dbda..c7820b0cd451900ca93438d4c802b100a843697b 100644
--- a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
@@ -21,6 +21,9 @@ using syncer_v2::ModelTypeService;
 using syncer_v2::SharedModelTypeProcessor;
 
 const char kKey1[] = "key1";
+const char kKey2[] = "key2";
+const char kKey3[] = "key3";
+const char kKey4[] = "key4";
 const char kValue1[] = "value1";
 const char kValue2[] = "value2";
 const char kResolutionValue[] = "RESOLVED";
@@ -302,3 +305,20 @@ IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, ConflictResolution) {
   ASSERT_TRUE(DataChecker(model1, kKey1, kResolutionValue).Wait());
   ASSERT_TRUE(DataChecker(model2, kKey1, kResolutionValue).Wait());
 }
+
+IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, Encryption) {
+  ASSERT_TRUE(SetupSync());
+  TestModelTypeService* model1 = GetModelTypeService(0);
+  TestModelTypeService* model2 = GetModelTypeService(1);
+
+  model1->WriteItem(kKey1, kValue1);

[maxbogue, 2016/09/21 00:57:14]

What are each of these four items testing?

[skym, 2016/09/22 18:58:44]

Reverted file.

+  model2->WriteItem(kKey2, kValue1);
+  ASSERT_TRUE(EnableEncryption(0));

[maxbogue, 2016/09/21 00:57:14]

So this is using... the old version of encryption, without a passphrase?

[skym, 2016/09/22 18:58:44]

Whoops, good catch. Breaking into multiple CLs.

+  model1->WriteItem(kKey3, kValue1);
+  model2->WriteItem(kKey4, kValue1);
+
+  ASSERT_TRUE(DataChecker(model2, kKey1, kValue1).Wait());
+  ASSERT_TRUE(DataChecker(model1, kKey1, kValue1).Wait());

[maxbogue, 2016/09/21 00:57:14]

I think you mean kKey2 here.

[skym, 2016/09/22 18:58:45]

You're right! Fixed.

+  ASSERT_TRUE(DataChecker(model2, kKey3, kValue1).Wait());
+  ASSERT_TRUE(DataChecker(model1, kKey4, kValue1).Wait());
+}