roll rlz 121:123
roll rlz 121:123

122: Warning fixes, gyp file cleanup, enable warnings as errors.
123: Try to fix a windows warning

BUG=none
TEST=none
TBR=rogerta
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/9875023

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@129524 0039d316-1c4b-4281-b951-d872f2087c98

ropik/chromium,adobe/chromium,yitian134/chromium,adobe/chromium,adobe/chromium,yitian134/chromium,adobe/chromium,yitian134/chromium,adobe/chromium,gavinp/chromium,yitian134/chromium,yitian134/chromium,adobe/chromium,ropik/chromium,gavinp/chromium,ropik/chromium,adobe/chromium,yitian134/chromium,gavinp/chromium,gavinp/chromium,adobe/chromium,ropik/chromium,gavinp/chromium,adobe/chromium,adobe/chromium,gavinp/chromium,gavinp/chromium,gavinp/chromium,ropik/chromium,gavinp/chromium,ropik/chromium,gavinp/chromium,yitian134/chromium,yitian134/chromium,adobe/chromium,yitian134/chromium,ropik/chromium,ropik/chromium,yitian134/chromium,ropik/chromium