Decouple ErrorState and ContextState.

Bug: 902904
Change-Id: Idaf970c574597d2436befccc4f0979392c125d89
Reviewed-on: https://chromium-review.googlesource.com/c/1362220
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613851}
9 files changed