GitLab

This change upstreams the downstream fixes to this test, so that this
file doesn't need to be forked for iOS anymore.

BUG=None

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

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