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

ui/compositor/test/context_factories_for_test.cc

Index: ui/compositor/test/context_factories_for_test.cc
diff --git a/ui/compositor/test/context_factories_for_test.cc b/ui/compositor/test/context_factories_for_test.cc
index 63b2d3a2c74099d778ecb8f6cbe82835f717e125..045739d0a6551f8decb447b81569c2b6ea1a045d 100644
--- a/ui/compositor/test/context_factories_for_test.cc
+++ b/ui/compositor/test/context_factories_for_test.cc
@@ -9,7 +9,6 @@
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/test/in_process_context_factory.h"
-#include "ui/compositor/test/test_context_factory.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace {
@@ -28,35 +27,9 @@ void InitializeContextFactoryForTests(bool enable_pixel_output) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
     enable_pixel_output = true;
-
-  bool use_test_contexts = true;
-
-  if (gfx::HasInitializedNullDrawGLBindings())
-    use_test_contexts = false;
-
-  // Always use test contexts unless the disable command line flag is used.
-  if (command_line->HasSwitch(switches::kDisableTestCompositor))
-    use_test_contexts = false;
-
-#if defined(OS_CHROMEOS)
-  // If the test is running on the chromeos envrionment (such as
-  // device or vm bots), always use real contexts.
-  if (base::SysInfo::IsRunningOnChromeOS())
-    use_test_contexts = false;
-#endif
-
   if (enable_pixel_output)
-    use_test_contexts = false;
-
-  if (use_test_contexts) {
-    g_implicit_factory = new ui::TestContextFactory;
-  } else {
-    DCHECK_NE(gfx::kGLImplementationNone, gfx::GetGLImplementation());
-    DVLOG(1) << "Using InProcessContextFactory";
-    if (enable_pixel_output && gfx::HasInitializedNullDrawGLBindings())
-      g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
-    g_implicit_factory = new ui::InProcessContextFactory();
-  }
+    g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
+  g_implicit_factory = new InProcessContextFactory();
   ContextFactory::SetInstance(g_implicit_factory);
 }