Fix history management regression while options page is loading (and add a test).

R=aboxhall@chromium.org
BUG=312648
TEST=browser_tests, manual (see bug)

Review URL: https://codereview.chromium.org/47593004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232204 0039d316-1c4b-4281-b951-d872f2087c98
Fix build of TestCompositorHostOzone

Review URL: https://codereview.chromium.org/47733004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232205 0039d316-1c4b-4281-b951-d872f2087c98
Mark test flaky

TBR=mazda@chromium.org

BUG=313401

Review URL: https://codereview.chromium.org/51123004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232206 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 232205
Added an error code for the reset-required condition.

When attestation has not been prepared on a device it means the device
was initialized before attestation support was added to the OS.
Clearing the device TPM will allow it to prepare attestation support.

BUG=chromium:313021
TEST=unit

Review URL: https://codereview.chromium.org/51673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232207 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 232207