Revert 113470 - Makes tests either use mock compositor or mock WebGraphicsContext3D depending upo...

ui/gfx/compositor/compositor_cc.cc

Index: ui/gfx/compositor/compositor_cc.cc
===================================================================
--- ui/gfx/compositor/compositor_cc.cc	(revision 113506)
+++ ui/gfx/compositor/compositor_cc.cc	(working copy)
@@ -22,12 +22,7 @@
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 namespace {
-
 webkit_glue::WebThreadImpl* g_compositor_thread = NULL;
-
-// If true a context is used that results in no rendering to the screen.
-bool test_context_enabled = false;
-
 }  // anonymous namespace
 
 namespace ui {
@@ -126,6 +121,9 @@
   NOTREACHED();
 }
 
+// static
+bool CompositorCC::test_context_enabled_ = false;
+
 CompositorCC::CompositorCC(CompositorDelegate* delegate,
                            gfx::AcceleratedWidget widget,
                            const gfx::Size& size)
@@ -174,6 +172,12 @@
   }
 }
 
+// static
+void CompositorCC::EnableTestContextIfNecessary() {
+  // TODO: only do this if command line param not set.
+  test_context_enabled_ = true;
+}
+
 Texture* CompositorCC::CreateTexture() {
   NOTREACHED();
   return NULL;
@@ -243,7 +247,7 @@
 
 WebKit::WebGraphicsContext3D* CompositorCC::createContext3D() {
   WebKit::WebGraphicsContext3D* context;
-  if (test_context_enabled) {
+  if (test_context_enabled_) {
     context = new TestWebGraphicsContext3D();
   } else {
     gfx::GLShareGroup* share_group =
@@ -282,15 +286,4 @@
   return new CompositorCC(owner, widget, size);
 }
 
-COMPOSITOR_EXPORT void SetupTestCompositor() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableTestCompositor)) {
-    test_context_enabled = true;
-  }
-}
-
-COMPOSITOR_EXPORT void DisableTestCompositor() {
-  test_context_enabled = false;
-}
-
 }  // namespace ui