Move writing adb keys into the wipe.

Move writing adb keys into the wipe.

This will allow the caller to specify an argument to adb public keys to be
written to the device (along with any existing keys already on the device)
during wiping.

BUG=

Committed: https://crrev.com/89f0fd6d122773f9375e0ab243f95dbb99bacd4e
Cr-Commit-Position: refs/heads/master@{#318717}

[navabi, 2015-02-28 19:09:17]

navabi@google.com changed reviewers:
+ friedman@chromium.org, jbudorick@chromium.org

[navabi, 2015-02-28 19:09:18]

Both John and Elliot expressed concern about the previous implementation.

So I changed it so that if you are wiping AND you specify the --adb-keys-file
argument, when you wipe it will write whatever keys were on the device, plus
whatever keys are pointed to by the key files you passed in. It uses a set so it
will avoid dupes.

[jbudorick, 2015-03-02 16:13:00]

lgtm w/ nits

https://codereview.chromium.org/970573002/diff/20001/build/android/provision_...
File build/android/provision_devices.py (right):

https://codereview.chromium.org/970573002/diff/20001/build/android/provision_...
build/android/provision_devices.py:143: as_root=True).rstrip('\n').split('\n')
nit: just do device.ReadFile(...).splitlines()

https://codereview.chromium.org/970573002/diff/20001/build/android/provision_...
build/android/provision_devices.py:148: for adb_key_file in
options.adb_key_files:
nit: as luqui pointed out to me in another review, these two lines could be
condensed to

  for adb_key_file in options.adb_key_files or []:

[navabi, 2015-03-02 16:36:43]

https://codereview.chromium.org/970573002/diff/20001/build/android/provision_...
File build/android/provision_devices.py (right):

https://codereview.chromium.org/970573002/diff/20001/build/android/provision_...
build/android/provision_devices.py:143: as_root=True).rstrip('\n').split('\n')
On 2015/03/02 16:13:00, jbudorick wrote:
> nit: just do device.ReadFile(...).splitlines()

Done.

https://codereview.chromium.org/970573002/diff/20001/build/android/provision_...
build/android/provision_devices.py:148: for adb_key_file in
options.adb_key_files:
On 2015/03/02 16:13:00, jbudorick wrote:
> nit: as luqui pointed out to me in another review, these two lines could be
> condensed to
> 
>   for adb_key_file in options.adb_key_files or []:

Done.

[navabi, 2015-03-02 16:37:05]

The CQ bit was checked by navabi@google.com

[navabi, 2015-03-02 16:37:06]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org
Link to the patchset: https://codereview.chromium.org/970573002/#ps40001 (title:
"Addressed nits.")

[commit-bot: I haz the power, 2015-03-02 16:38:12]

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

[commit-bot: I haz the power, 2015-03-02 17:39:11]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-03-02 17:39:47]

Patchset 3 (id:??) landed as
https://crrev.com/89f0fd6d122773f9375e0ab243f95dbb99bacd4e
Cr-Commit-Position: refs/heads/master@{#318717}