Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

ui/gfx/compositor/compositor_cc.h

Index: ui/gfx/compositor/compositor_cc.h
===================================================================
--- ui/gfx/compositor/compositor_cc.h	(revision 113682)
+++ ui/gfx/compositor/compositor_cc.h	(working copy)
@@ -90,6 +90,10 @@
   static void Initialize(bool useThread);
   static void Terminate();
 
+  // If necessary enables the test context. If the test context is enabled the
+  // compositor does not render anything to screen.
+  static void EnableTestContextIfNecessary();
+
  protected:
   // Compositor implementation.
   virtual Texture* CreateTexture() OVERRIDE;
@@ -119,6 +123,9 @@
   WebKit::WebLayer root_web_layer_;
   WebKit::WebLayerTreeView host_;
 
+  // See description above SetTestContextEnabled.
+  static bool test_context_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(CompositorCC);
 };