Update from https://crrev.com/315085

mojo/gles2/command_buffer_client_impl.h

 // Copyright 2014 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.
 
 #ifndef MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_
 #define MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_
 
 #include <map>
 
 #include "base/macros.h"
@@ skipping 24 matching lines @@
  public:
   explicit CommandBufferClientImpl(
       CommandBufferDelegate* delegate,
       const MojoAsyncWaiter* async_waiter,
       mojo::ScopedMessagePipeHandle command_buffer_handle);
   ~CommandBufferClientImpl() override;
 
   // CommandBuffer implementation:
   bool Initialize() override;
   State GetLastState() override;
-  int32 GetLastToken() override;
-  void Flush(int32 put_offset) override;
-  void WaitForTokenInRange(int32 start, int32 end) override;
-  void WaitForGetOffsetInRange(int32 start, int32 end) override;
-  void SetGetBuffer(int32 shm_id) override;
+  int32_t GetLastToken() override;
+  void Flush(int32_t put_offset) override;
+  void OrderingBarrier(int32_t put_offset) override;
+  void WaitForTokenInRange(int32_t start, int32_t end) override;
+  void WaitForGetOffsetInRange(int32_t start, int32_t end) override;
+  void SetGetBuffer(int32_t shm_id) override;
   scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
-                                                  int32* id) override;
-  void DestroyTransferBuffer(int32 id) override;
+                                                  int32_t* id) override;
+  void DestroyTransferBuffer(int32_t id) override;
 
   // gpu::GpuControl implementation:
   gpu::Capabilities GetCapabilities() override;
   int32_t CreateImage(ClientBuffer buffer,
                       size_t width,
                       size_t height,
                       unsigned internalformat) override;
   void DestroyImage(int32_t id) override;
   int32_t CreateGpuMemoryBufferImage(size_t width,
                                      size_t height,
@@ skipping 26 matching lines @@
   CommandBufferDelegate* delegate_;
   mojo::Binding<mojo::CommandBufferLostContextObserver> observer_binding_;
   mojo::CommandBufferPtr command_buffer_;
   scoped_ptr<SyncClientImpl> sync_client_impl_;
   scoped_ptr<SyncPointClientImpl> sync_point_client_impl_;
 
   gpu::Capabilities capabilities_;
   State last_state_;
   mojo::ScopedSharedBufferHandle shared_state_handle_;
   gpu::CommandBufferSharedState* shared_state_;
-  int32 last_put_offset_;
-  int32 next_transfer_buffer_id_;
+  int32_t last_put_offset_;
+  int32_t next_transfer_buffer_id_;
 
   const MojoAsyncWaiter* async_waiter_;
 };
 
 }  // gles2
 
 #endif  // MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_