Update from https://crrev.com/316786

gpu/gles2_conform_support/gles2_conform_test.gyp

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
 
   'includes': [
     'gles2_conform.gypi',
   ],
   'target_defaults': {
@@ skipping 119 matching lines @@
                 '<(angle_path)/src/angle.gyp:libEGL',
               ],
               'defines': [
                 'EGLAPI=',
                 'EGLAPIENTRY=',
               ],
               'msvs_disabled_warnings': [
                 4018,  # signed/unsigned mismatch
                 4101,  # unreferenced local variable
                 4715,  # not all control paths return a value
+                4267,  # size_t/unsigned int conversion
               ],
-              'msvs_settings': {
-                'VCCLCompilerTool': {
-                  'AdditionalOptions': ['/UNOMINMAX'],
-                },
-              },
+              'defines!': [ 'NOMINMAX' ],
             }],
             ['OS=="mac"', {
               'defines': [
                 '_STDINT',
                 '_STDINT_H',
               ],
               'conditions': [
                 [ 'clang==1', {
                   'cflags': [
                     '-Wno-pointer-sign',
@@ skipping 98 matching lines @@
     }],
   ],
 }
 
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: