Makes tests either use mock compositor or mock WebGraphicsContext3D

ui/gfx/compositor/compositor.h

Index: ui/gfx/compositor/compositor.h
diff --git a/ui/gfx/compositor/compositor.h b/ui/gfx/compositor/compositor.h
index 2b41553d391e6bf43de20aceacfef77249e9f45b..8b3a4aa101691fd308e524726a4434a254ac2f36 100644
--- a/ui/gfx/compositor/compositor.h
+++ b/ui/gfx/compositor/compositor.h
@@ -159,16 +159,6 @@ class COMPOSITOR_EXPORT Compositor : public base::RefCounted<Compositor> {
   void RemoveObserver(CompositorObserver* observer);
   bool HasObserver(CompositorObserver* observer);
 
-  static void set_compositor_factory_for_testing(
-      ui::Compositor*(*factory)(ui::CompositorDelegate* owner)) {
-    compositor_factory_ = factory;
-  }
-
-  static ui::Compositor* (*compositor_factory())(
-      ui::CompositorDelegate* owner) {
-    return compositor_factory_;
-  }
-
  protected:
   Compositor(CompositorDelegate* delegate, const gfx::Size& size);
   virtual ~Compositor();
@@ -206,12 +196,6 @@ class COMPOSITOR_EXPORT Compositor : public base::RefCounted<Compositor> {
 
   ObserverList<CompositorObserver> observer_list_;
 
-  // Factory used to create Compositors. Settable by tests.
-  // The delegate can be NULL if you don't wish to catch the ScheduleDraw()
-  // calls to it.
-  static ui::Compositor*(*compositor_factory_)(
-      ui::CompositorDelegate* delegate);
-
   friend class base::RefCounted<Compositor>;
 };