Snapshot of all changes to get jumbo in blink and content.

content/browser/gpu/gpu_internals_ui.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 "content/browser/gpu/gpu_internals_ui.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 27 matching lines @@
 #include "content/public/common/url_constants.h"
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
 #include "skia/ext/skia_commit_hash.h"
 #include "third_party/angle/src/common/version.h"
 #include "third_party/skia/include/core/SkMilestone.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 #if defined(OS_LINUX) && defined(USE_X11)
-#include <X11/Xlib.h>
+#include "ui/base/x/x11_util_internal.h"
 #endif
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #include "ui/gfx/win/physical_size.h"
 #endif
 
 #if defined(OS_LINUX) && defined(USE_X11)
 #include "ui/base/x/x11_util.h"       // nogncheck
 #include "ui/gfx/x/x11_atom_cache.h"  // nogncheck
 #endif
@@ skipping 501 matching lines @@
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(base::MakeUnique<GpuMessageHandler>());
 
   // Set up the chrome://gpu/ source.
   BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
 }
 
 }  // namespace content