Revert of Make CapabilityFilter be part of Identity

Revert of Make CapabilityFilter be part of Identity (patchset #15 id:280001 of https://codereview.chromium.org/1354003002/ )

Reason for revert:
Reverting for test breakage, more info on the bug.
BUG=534227
Original issue's description:
> Make CapabilityFilter be part of Identity
>
> R=yzshen@chromium.org
> http://crbug.com/533085
>
> Committed: https://crrev.com/5403e28c9d9bfcf00b12721b6dc96c00f6d1ed24
> Cr-Commit-Position: refs/heads/master@{#349815}

TBR=yzshen@chromium.org,ben@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://crrev.com/3cc08430d1ec58b37e9136d5dda3462397a250d2
Cr-Commit-Position: refs/heads/master@{#349907}

[vabr (Chromium), 2015-09-21 06:58:28]

Created Revert of Make CapabilityFilter be part of Identity

[commit-bot: I haz the power, 2015-09-21 06:58:39]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1351443004/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1351443004/1

[commit-bot: I haz the power, 2015-09-21 06:59:01]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-09-21 06:59:39]

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