ui: No more TestCompositor. Use NullDraw contexts in unit tests.

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 "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 {
 
 namespace {
 base::LazyInstance<base::ThreadLocalPointer<GLSurface> >::Leaky
     current_surface_ = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 // static
 bool GLSurface::InitializeOneOff() {
   DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
@@ skipping 56 matching lines @@
     if (gpu_service_logging)
       InitializeDebugGLBindings();
     if (disable_gl_drawing)
       InitializeNullDrawGLBindings();
   }
   return initialized;
 }
 
 // static
 void GLSurface::InitializeOneOffForTests() {
+#if defined(USE_X11)
+  XInitThreads();
+#endif
+
   bool use_osmesa = true;
 
 #if defined(OS_ANDROID)
   // On Android we always use hardware GL.
   use_osmesa = false;
 #endif
 
   std::vector<GLImplementation> allowed_impls;
   GetAllowedGLImplementations(&allowed_impls);
   DCHECK(!allowed_impls.empty());
 
   GLImplementation impl = allowed_impls[0];
   if (use_osmesa)
     impl = kGLImplementationOSMesaGL;
 
   DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
       << "kUseGL has not effect in tests";
 
   bool fallback_to_osmesa = false;
   bool gpu_service_logging = false;
-  bool disable_gl_drawing = false;
-  // TODO(danakj): Unit tests do not produce pixel output by default.
-  // bool disable_gl_drawing = true;
+  // Unit tests do not produce pixel output by default.
+  bool disable_gl_drawing = true;
 
   CHECK(InitializeOneOffImplementation(
       impl, fallback_to_osmesa, gpu_service_logging, disable_gl_drawing));
 }
 
 // static
 void GLSurface::InitializeOneOffWithMockBindingsForTests() {
   DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
       << "kUseGL has not effect in tests";
 
@@ skipping 197 matching lines @@
   return surface_->GetFormat();
 }
 
 VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() {
   return surface_->GetVSyncProvider();
 }
 
 GLSurfaceAdapter::~GLSurfaceAdapter() {}
 
 }  // namespace gfx