Merge: Fix obvious compilation breakage on win32 in previous version. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/814903002 Review URL: https://codereview.chromium.org/816743002