[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

 // Copyright 2016 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.
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/browser_sync/profile_sync_components_factory_impl.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/api/fake_model_type_service.h"
 
 using browser_sync::ChromeSyncClient;
 using syncer_v2::FakeModelTypeService;
 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";
 
 // A ChromeSyncClient that provides a ModelTypeService for PREFERENCES.
 class TestSyncClient : public ChromeSyncClient {
  public:
   TestSyncClient(Profile* profile, ModelTypeService* service)
       : ChromeSyncClient(profile), service_(service) {}
 
@@ skipping 261 matching lines @@
 
   // Write conflicting entities.
   model1->WriteItem(kKey1, kValue1);
   model2->WriteItem(kKey1, kValue2);
 
   // Wait for them to be resolved to kResolutionValue by the custom conflict
   // resolution logic in TestModelTypeService.
   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());
+}