[Sync] Test encryption UI options.

[Sync] Test encryption UI options.

Add tests to make sure the encryption UI shows the correct options
by default, and that those options are enabled.

BUG=480604
Committed: https://crrev.com/532127e589e8b7e0fb95481cdb4995980f49c5a9
Cr-Commit-Position: refs/heads/master@{#330122}

[maxbogue, 2015-05-14 20:06:40]

maxbogue@chromium.org changed reviewers:
+ maniscalco@chromium.org

[maxbogue, 2015-05-14 20:06:41]

Hey Nick, could you please review this change?

[maniscalco, 2015-05-14 20:54:17]

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
File
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
(right):

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java:123:
public void testDefaultEncryptionOptions() throws Exception {
It would be helpful to have a comment that explains what this test case is
looking for.  E.g.

// Verify the UI present options for ... and that <blank> is the default.

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java:136:
assertEquals(PassphraseType.CUSTOM_PASSPHRASE, adapter.getType(0));
Is the order of CUSTOM_PASSPHRASE and KEYSTORE_PASSPHRASE important (0 vs 1) or
is it more like "set equality"?

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java:143:
assertEquals(2, listView.getCount());
Any reason this is last?  Might make more sense to put this assert just before
listView.getChildAt() is called.

[maxbogue, 2015-05-14 22:03:58]

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
File
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
(right):

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java:123:
public void testDefaultEncryptionOptions() throws Exception {
On 2015/05/14 20:54:16, maniscalco wrote:
> It would be helpful to have a comment that explains what this test case is
> looking for.  E.g.
> 
> // Verify the UI present options for ... and that <blank> is the default.

Done.

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java:136:
assertEquals(PassphraseType.CUSTOM_PASSPHRASE, adapter.getType(0));
On 2015/05/14 20:54:16, maniscalco wrote:
> Is the order of CUSTOM_PASSPHRASE and KEYSTORE_PASSPHRASE important (0 vs 1)
or
> is it more like "set equality"?

Order is only important since we've set this as the expected behavior. It would
be bad for it to change without reason, though not terrible. I've added a
comment to make it clearer that the order is actually part of what's being
checked there.

https://codereview.chromium.org/1124073004/diff/20001/chrome/android/sync_she...
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java:143:
assertEquals(2, listView.getCount());
On 2015/05/14 20:54:17, maniscalco wrote:
> Any reason this is last?  Might make more sense to put this assert just before
> listView.getChildAt() is called.

Done.

[maxbogue, 2015-05-15 01:41:48]

PTAL; the patch had failed because of a merge conflict. Fixed now.

[maniscalco, 2015-05-15 15:34:05]

lgtm

[maxbogue, 2015-05-15 16:44:01]

The CQ bit was checked by maxbogue@chromium.org

[commit-bot: I haz the power, 2015-05-15 16:45:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1124073004/60001

[commit-bot: I haz the power, 2015-05-15 16:55:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-15 16:55:25]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[maxbogue, 2015-05-15 17:19:45]

maxbogue@chromium.org changed reviewers:
+ newt@chromium.org, zea@chromium.org

[maxbogue, 2015-05-15 17:19:46]

Whoops, forgot about owners.

+Nicolas for sync stuff
+Newt for values.xml

[Nicolas Zea, 2015-05-15 17:24:13]

lgtm

[newt (away), 2015-05-15 17:27:51]

lgtm

[maxbogue, 2015-05-15 17:30:58]

The CQ bit was checked by maxbogue@chromium.org

[commit-bot: I haz the power, 2015-05-15 17:31:23]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1124073004/60001

[commit-bot: I haz the power, 2015-05-15 17:36:08]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-05-15 17:37:07]

Patchset 4 (id:??) landed as
https://crrev.com/532127e589e8b7e0fb95481cdb4995980f49c5a9
Cr-Commit-Position: refs/heads/master@{#330122}