Pull GN @ 238225

BUG=
R=scottmg@chromium.org

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

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