Update from https://crrev.com/314320

ui/gl/gl_surface_wgl.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_wgl.h"
 
-#include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_wgl_api_implementation.h"
 
 namespace gfx {
 
 namespace {
 const PIXELFORMATDESCRIPTOR kPixelFormatDescriptor = {
   sizeof(kPixelFormatDescriptor),    // Size of structure.
   1,                       // Default version.
@@ skipping 332 matching lines @@
 
 gfx::Size PbufferGLSurfaceWGL::GetSize() {
   return size_;
 }
 
 void* PbufferGLSurfaceWGL::GetHandle() {
   return device_context_;
 }
 
 }  // namespace gfx