Keyset transition regression fix + test.

BUG=336226

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

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