[Sync] Introduce GmsCoreSyncListener.

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8713adddd6d8402af668de6d5ce5dff09457ba79
--- /dev/null
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
@@ -0,0 +1,129 @@
+// Copyright 2015 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.
+
+package org.chromium.chrome.browser.sync;
+
+import android.accounts.Account;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
+
+/**
+ * Test suite for the GmsCoreSyncListener.
+ */
+public class GmsCoreSyncListenerTest extends SyncTestBase {
+    private static final String PASSPHRASE = "passphrase";
+
+    static class CountingGmsCoreSyncListener extends GmsCoreSyncListener {
+        private int mCallCount = 0;
+
+        @Override
+        public void updateEncryptionKey(byte[] key) {
+            mCallCount++;
+        }
+
+        public int callCount() {
+            return mCallCount;
+        }
+    }
+
+    private CountingGmsCoreSyncListener mListener;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mListener = new CountingGmsCoreSyncListener();
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ProfileSyncService.get().addSyncStateChangedListener(mListener);
+            }
+        });
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ProfileSyncService.get().removeSyncStateChangedListener(mListener);
+            }
+        });
+        super.tearDown();
+    }
+
+    @MediumTest
+    @Feature({"Sync"})
+    public void testGetsKey() throws Throwable {

[Nicolas Zea, 2015/11/17 22:47:45]

nit: is it normal to have the tests defined above the helper methods they use?
Maybe move these two down to the end of the class?

[maxbogue, 2015/11/17 23:25:31]

Yeah, it's pretty common to have all the helpers down at the bottom so it's
easier to find the actual tests and see what they do. Sometimes the helper
section is significantly longer than the tests themselves, and most helpers are
fairly self-explanatory by name, so it seems to make sense to do it this way.

+        Account account = setUpTestAccountAndSignInToSync();
+        assertEquals(0, mListener.callCount());
+        encryptWithPassphrase(PASSPHRASE);
+        waitForCallCount(1);
+        signOut();
+        signIn(account);
+        assertEquals(1, mListener.callCount());
+        decryptWithPassphrase(PASSPHRASE);
+        waitForCallCount(2);
+    }
+
+    @MediumTest
+    @Feature({"Sync"})
+    public void testClearData() throws Throwable {
+        setUpTestAccountAndSignInToSync();
+        assertEquals(0, mListener.callCount());
+        encryptWithPassphrase(PASSPHRASE);
+        waitForCallCount(1);
+        clearServerData();
+        startSync();
+        encryptWithPassphrase(PASSPHRASE);
+        waitForCallCount(2);
+    }
+
+    private void encryptWithPassphrase(final String passphrase) throws InterruptedException {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ProfileSyncService.get().setEncryptionPassphrase(passphrase);
+            }
+        });
+        waitForCryptographer();
+        // Make sure the new encryption settings make it to the server.
+        SyncTestUtil.triggerSyncAndWaitForCompletion(mContext);
+    }
+
+    private void decryptWithPassphrase(final String passphrase) throws InterruptedException {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ProfileSyncService.get().setDecryptionPassphrase(passphrase);
+            }
+        });
+    }
+
+    private void waitForCryptographer() throws InterruptedException {
+        boolean isReady = CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                ProfileSyncService syncService = ProfileSyncService.get();
+                return syncService.isUsingSecondaryPassphrase()
+                        && syncService.isCryptographerReady();
+            }
+        });
+        assertTrue("Timed out waiting for cryptographer to be ready.", isReady);
+    }
+
+    private void waitForCallCount(final int count) throws InterruptedException {
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mListener.callCount() == count;
+            }
+        });
+        assertEquals(count, mListener.callCount());
+    }
+}