X11: Use better visuals for OpenGL

ui/views/test/views_test_base.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/views/test/views_test_base.h"
 
 #include <utility>
 
 #include "base/environment.h"
 #include "base/run_loop.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/views/test/platform_test_helper.h"
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 #include "ui/base/x/x11_util_internal.h"
 #endif
 
 namespace views {
 
 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;
 
   // 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
 }
 
 }  // namespace
 
 ViewsTestBase::ViewsTestBase()
     : setup_called_(false),
       teardown_called_(false),
@@ skipping 50 matching lines @@
 
 gfx::NativeWindow ViewsTestBase::GetContext() {
   return test_helper_->GetContext();
 }
 
 bool ViewsTestBase::HasCompositingManager() const {
   return has_compositing_manager_;
 }
 
 }  // namespace views