As mentioned, I discovered ForceClear doesn't really require any reboots.  This change takes advantage of this fact.

Note that I am still using TPM_MUST_REBOOT because if power is lost between ForceClear and resetting the deactivated flag, the TPM will *really* be disabled at the next reboot, and it's nice to fix this problem automatically.

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