Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/command_buffer/build_gles2_cmd_buffer.py

Index: gpu/command_buffer/build_gles2_cmd_buffer.py
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 141d2599019041dc1417045a8ca4ee2acbde104d..ca391507be2cbff74f63bbbbff681d3382e00f57 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -1429,17 +1429,6 @@ _NAMED_TYPE_INFO = {
       '1',
     ],
   },
-  'SyncFlushFlags': {
-    'type': 'GLbitfield',
-    'is_complete': True,
-    'valid': [
-      'GL_SYNC_FLUSH_COMMANDS_BIT',
-      '0',
-    ],
-    'invalid': [
-      '0xFFFFFFFF',
-    ],
-  },
 }
 
 # This table specifies the different pepper interfaces that are supported for
@@ -1653,14 +1642,6 @@ _FUNCTION_INFO = {
       '0': '0.5f'
     },
   },
-  'ClientWaitSync': {
-    'type': 'Custom',
-    'data_transfer_methods': ['shm'],
-    'cmd_args': 'GLuint sync, GLbitfieldSyncFlushFlags flags, '
-                'GLuint timeout_0, GLuint timeout_1, GLenum* result',
-    'unsafe': True,
-    'result': ['GLenum'],
-  },
   'ColorMask': {
     'type': 'StateSet',
     'state': 'ColorMask',
@@ -2928,14 +2909,6 @@ _FUNCTION_INFO = {
                 'GLsizei stride, GLuint offset',
     'client_test': False,
   },
-  'WaitSync': {
-    'type': 'Custom',
-    'cmd_args': 'GLuint sync, GLbitfieldSyncFlushFlags flags, '
-                'GLuint timeout_0, GLuint timeout_1',
-    'impl_func': False,
-    'client_test': False,
-    'unsafe': True,
-  },
   'Scissor': {
     'type': 'StateSet',
     'state': 'Scissor',
@@ -8998,12 +8971,11 @@ class GLGenerator(object):
     # Forward declaration of a few enums used in constant argument
     # to avoid including GL header files.
     enum_defines = {
-        'GL_SYNC_GPU_COMMANDS_COMPLETE': '0x9117',
-        'GL_SYNC_FLUSH_COMMANDS_BIT': '0x00000001',
+        'GL_SYNC_GPU_COMMANDS_COMPLETE': 0x9117,
       }
     file.Write('\n')
     for enum in enum_defines:
-      file.Write("#define %s %s\n" % (enum, enum_defines[enum]))
+      file.Write("#define %s 0x%x\n" % (enum, enum_defines[enum]))
     file.Write('\n')
     for func in self.functions:
       if True: