Update from https://crrev.com/309717

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 19 matching lines @@
 // static
 bool GLSurface::InitializeOneOff(GLImplementation impl) {
   DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
 
   TRACE_EVENT0("gpu", "GLSurface::InitializeOneOff");
 
   std::vector<GLImplementation> allowed_impls;
   GetAllowedGLImplementations(&allowed_impls);
   DCHECK(!allowed_impls.empty());
 
-  CommandLine* cmd = CommandLine::ForCurrentProcess();
+  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
 
   // The default implementation is always the first one in list.
   if (impl == kGLImplementationNone)
     impl = allowed_impls[0];
   bool fallback_to_osmesa = false;
   if (cmd->HasSwitch(switches::kOverrideUseGLWithOSMesaForTests)) {
     impl = kGLImplementationOSMesaGL;
   } else if (cmd->HasSwitch(switches::kUseGL)) {
     std::string requested_implementation_name =
         cmd->GetSwitchValueASCII(switches::kUseGL);
@@ skipping 51 matching lines @@
   DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
 
 #if defined(USE_X11)
   XInitThreads();
 #endif
 
   bool use_osmesa = true;
 
   // We usually use OSMesa as this works on all bots. The command line can
   // override this behaviour to use hardware GL.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGpuInTests))
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUseGpuInTests))
     use_osmesa = false;
 
 #if defined(OS_ANDROID)
   // On Android we always use hardware GL.
   use_osmesa = false;
 #endif
 
   std::vector<GLImplementation> allowed_impls;
   GetAllowedGLImplementations(&allowed_impls);
   DCHECK(!allowed_impls.empty());
 
   GLImplementation impl = allowed_impls[0];
   if (use_osmesa)
     impl = kGLImplementationOSMesaGL;
 
-  DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
+  DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
       << "kUseGL has not effect in tests";
 
   bool fallback_to_osmesa = false;
   bool gpu_service_logging = false;
   bool disable_gl_drawing = true;
 
   CHECK(InitializeOneOffImplementation(
       impl, fallback_to_osmesa, gpu_service_logging, disable_gl_drawing));
 }
 
 // static
 void GLSurface::InitializeOneOffWithMockBindingsForTests() {
-  DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
+  DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
       << "kUseGL has not effect in tests";
 
   // This method may be called multiple times in the same process to set up
   // mock bindings in different ways.
   ClearGLBindings();
 
   bool fallback_to_osmesa = false;
   bool gpu_service_logging = false;
   bool disable_gl_drawing = false;
 
@@ skipping 33 matching lines @@
 }
 
 bool GLSurface::SupportsPostSubBuffer() {
   return false;
 }
 
 unsigned int GLSurface::GetBackingFrameBufferObject() {
   return 0;
 }
 
+bool GLSurface::SwapBuffersAsync(const SwapCompletionCallback& callback) {
+  DCHECK(!IsSurfaceless());
+  bool success = SwapBuffers();
+  callback.Run();
+  return success;
+}
+
 bool GLSurface::PostSubBuffer(int x, int y, int width, int height) {
   return false;
 }
 
+bool GLSurface::PostSubBufferAsync(int x,
+                                   int y,
+                                   int width,
+                                   int height,
+                                   const SwapCompletionCallback& callback) {
+  bool success = PostSubBuffer(x, y, width, height);
+  callback.Run();
+  return success;
+}
+
 bool GLSurface::OnMakeCurrent(GLContext* context) {
   return true;
 }
 
 void GLSurface::NotifyWasBound() {
 }
 
 bool GLSurface::SetBackbufferAllocation(bool allocated) {
   return true;
 }
@@ skipping 87 matching lines @@
 }
 
 bool GLSurfaceAdapter::IsOffscreen() {
   return surface_->IsOffscreen();
 }
 
 bool GLSurfaceAdapter::SwapBuffers() {
   return surface_->SwapBuffers();
 }
 
+bool GLSurfaceAdapter::SwapBuffersAsync(
+    const SwapCompletionCallback& callback) {
+  return surface_->SwapBuffersAsync(callback);
+}
+
 bool GLSurfaceAdapter::PostSubBuffer(int x, int y, int width, int height) {
   return surface_->PostSubBuffer(x, y, width, height);
 }
 
+bool GLSurfaceAdapter::PostSubBufferAsync(
+    int x, int y, int width, int height,
+        const SwapCompletionCallback& callback) {
+  return surface_->PostSubBufferAsync(x, y, width, height, callback);
+}
+
 bool GLSurfaceAdapter::SupportsPostSubBuffer() {
   return surface_->SupportsPostSubBuffer();
 }
 
 gfx::Size GLSurfaceAdapter::GetSize() {
   return surface_->GetSize();
 }
 
 void* GLSurfaceAdapter::GetHandle() {
   return surface_->GetHandle();
@@ skipping 44 matching lines @@
       z_order, transform, image, bounds_rect, crop_rect);
 }
 
 bool GLSurfaceAdapter::IsSurfaceless() const {
   return surface_->IsSurfaceless();
 }
 
 GLSurfaceAdapter::~GLSurfaceAdapter() {}
 
 }  // namespace gfx