Undo Windows gyp split from r42397, and update for new gyp changes.

Review URL: http://codereview.chromium.org/1239007

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