Update from https://crrev.com/314320

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"
-#include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
+#include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
 namespace gfx {
 
@@ skipping 371 matching lines @@
       z_order, transform, image, bounds_rect, crop_rect);
 }
 
 bool GLSurfaceAdapter::IsSurfaceless() const {
   return surface_->IsSurfaceless();
 }
 
 GLSurfaceAdapter::~GLSurfaceAdapter() {}
 
 }  // namespace gfx