X11: Use better visuals for OpenGL

ui/views/test/views_test_base.cc

Index: ui/views/test/views_test_base.cc
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index d3dbd71dbcaa2e47e6c4579b74da0be2069fcb7e..a077dffe1227e450ebf0b5ceffa3f48a88a9f1e5 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -23,8 +23,11 @@ namespace {
 
 bool InitializeVisuals() {
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  static int depth = 0;
-  static bool has_compositing_manager = false;
+  bool has_compositing_manager = false;
+  Visual* visual;
+  int depth = 0;
+  Colormap colormap;
+  bool using_argb_visual;
 
   if (depth > 0)
     return has_compositing_manager;
@@ -32,12 +35,13 @@ bool InitializeVisuals() {
   // testing/xvfb.py runs xvfb and xcompmgr.
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   has_compositing_manager = env->HasVar("_CHROMIUM_INSIDE_XVFB");
-  ui::ChooseVisualForWindow(has_compositing_manager, NULL, &depth);
+  ui::XVisualManager::GetInstance()->ChooseVisualForWindow(
+      has_compositing_manager, &visual, &depth, &colormap, &using_argb_visual);
 
-  if (has_compositing_manager)
+  if (using_argb_visual)
     EXPECT_EQ(32, depth);
 
-  return has_compositing_manager;
+  return using_argb_visual;
 #else
   return false;
 #endif