Update from https://crrev.com/305340

ui/gl/gl_surface.cc

 // 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.
 
 #include "ui/gl/gl_surface.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 148 matching lines @@
 void GLSurface::InitializeDynamicMockBindingsForTests(GLContext* context) {
   CHECK(InitializeDynamicGLBindings(kGLImplementationMockGL, context));
 }
 
 GLSurface::GLSurface() {}
 
 bool GLSurface::Initialize() {
   return true;
 }
 
+void GLSurface::DestroyAndTerminateDisplay() {
+  Destroy();
+}
+
 bool GLSurface::Resize(const gfx::Size& size) {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool GLSurface::Recreate() {
   NOTIMPLEMENTED();
   return false;
 }
 
@@ skipping 178 matching lines @@
       z_order, transform, image, bounds_rect, crop_rect);
 }
 
 bool GLSurfaceAdapter::IsSurfaceless() const {
   return surface_->IsSurfaceless();
 }
 
 GLSurfaceAdapter::~GLSurfaceAdapter() {}
 
 }  // namespace gfx