GitLab

When iframe upgrades were moved out of crrev.com/c/1067846 and into
crrev.com/c/1086005, some non iframe specific code was also moved by
mistake, this is that code, along with the tests.

Change-Id: I41aece313c1dd6504e9a27bb85fb810c975e8167
Reviewed-on: https://chromium-review.googlesource.com/1091184Reviewed-by: Camille Lamy <clamy@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565657}