GitLab

This is a partial revert of the WebViewPlugin changes in
https://crrev.com/8489f1bf78c2c6f296e0df6c529751d29e8a0188

BUG=641028

Review-Url: https://codereview.chromium.org/2349443003
Cr-Commit-Position: refs/heads/master@{#419387}