Always clear TPM attestation keys on ChromeOS when removing media licenses

Always clear TPM attestation keys on ChromeOS when removing media licenses

Clearing the TPM attestation keys is not dependent on plugins being enabled,
(or Flash), so cleanup the #if ... #endif blocks to make this clear.

BUG=692818
TEST=compiles

Review-Url: https://codereview.chromium.org/2730803002
Cr-Commit-Position: refs/heads/master@{#454472}
Committed: https://chromium.googlesource.com/chromium/src/+/521d60812176375b2a0f196c7ccd31f38d524efa

[jrummell, 2017-03-02 22:58:31]

jrummell@chromium.org changed reviewers:
+ msramek@chromium.org

[jrummell, 2017-03-02 22:58:32]

PTAL. Trivial change that un-nests #if ... #endif to make it clear they're
independent.

[msramek, 2017-03-03 01:26:22]

LGTM

[jrummell, 2017-03-03 01:26:42]

The CQ bit was checked by jrummell@chromium.org

[commit-bot: I haz the power, 2017-03-03 01:27:15]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-03 02:25:08]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1488504402971910, "parent_rev":
"939b32ee5ba05c396eef3fd992822fcca9a2e262", "commit_rev":
"521d60812176375b2a0f196c7ccd31f38d524efa"}

[commit-bot: I haz the power, 2017-03-03 02:25:46]

Description was changed from

==========
Always clear TPM attestation keys on ChromeOS when removing media licenses

Clearing the TPM attestation keys is not dependent on plugins being enabled,
(or Flash), so cleanup the #if ... #endif blocks to make this clear.

BUG=692818
TEST=compiles
==========

to

==========
Always clear TPM attestation keys on ChromeOS when removing media licenses

Clearing the TPM attestation keys is not dependent on plugins being enabled,
(or Flash), so cleanup the #if ... #endif blocks to make this clear.

BUG=692818
TEST=compiles

Review-Url: https://codereview.chromium.org/2730803002
Cr-Commit-Position: refs/heads/master@{#454472}
Committed:
https://chromium.googlesource.com/chromium/src/+/521d60812176375b2a0f196c7ccd...
==========

[commit-bot: I haz the power, 2017-03-03 02:25:51]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/521d60812176375b2a0f196c7ccd...