Update from https://crrev.com/316786

gpu/gles2_conform_support/egl/display.h

 // Copyright (c) 2012 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 GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
 
 #include <EGL/egl.h>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 74 matching lines @@
                                      unsigned internalformat,
                                      unsigned usage) override;
   uint32 InsertSyncPoint() override;
   uint32 InsertFutureSyncPoint() override;
   void RetireSyncPoint(uint32 sync_point) override;
   void SignalSyncPoint(uint32 sync_point,
                        const base::Closure& callback) override;
   void SignalQuery(uint32 query, const base::Closure& callback) override;
   void SetSurfaceVisible(bool visible) override;
   uint32 CreateStreamTexture(uint32 texture_id) override;
+  void SetLock(base::Lock*) override;
 
  private:
   EGLNativeDisplayType display_id_;
 
   bool is_initialized_;
   bool create_offscreen_;
   int create_offscreen_width_;
   int create_offscreen_height_;
 
   scoped_ptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_refptr<gfx::GLContext> gl_context_;
   scoped_refptr<gfx::GLSurface> gl_surface_;
   scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
   scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
 
   // TODO(alokp): Support more than one config, surface, and context.
   scoped_ptr<Config> config_;
   scoped_ptr<Surface> surface_;
   scoped_ptr<gpu::gles2::GLES2Implementation> context_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace egl
 
 #endif  // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_