fix_pkcs11_token: detect if a token is from a previous tpm owner

There is a bit of refactoring in here too, to avoid stairstepping if/thens.

BUG=chromium-os:6064
TEST=simulate various failures in dev environment

Change-Id: Ic4d8ce36671c8ab289ff91c7063c7a8523e71efa

Review URL: http://codereview.chromium.org/3362005
1 file changed