Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/ui/compositor/compositor.h

Index: trunk/src/ui/compositor/compositor.h
===================================================================
--- trunk/src/ui/compositor/compositor.h	(revision 216906)
+++ trunk/src/ui/compositor/compositor.h	(working copy)
@@ -99,10 +99,6 @@
 
   // Destroys per-compositor data.
   virtual void RemoveCompositor(Compositor* compositor) = 0;
-
-  // When true, the factory uses test contexts that do not do real GL
-  // operations.
-  virtual bool DoesCreateTestContexts() = 0;
 };
 
 // The default factory that creates in-process contexts.
@@ -127,7 +123,6 @@
   virtual scoped_refptr<cc::ContextProvider>
       OffscreenContextProviderForCompositorThread() OVERRIDE;
   virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
-  virtual bool DoesCreateTestContexts() OVERRIDE;
 
   bool Initialize();
 
@@ -166,7 +161,6 @@
   virtual scoped_refptr<cc::ContextProvider>
       OffscreenContextProviderForCompositorThread() OVERRIDE;
   virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
-  virtual bool DoesCreateTestContexts() OVERRIDE;
 
  private:
   scoped_refptr<ContextProviderFromContextFactory>
@@ -296,14 +290,6 @@
              gfx::AcceleratedWidget widget);
   virtual ~Compositor();
 
-  // Set up the compositor ContextFactory for a test environment. Unit tests
-  // that do not have a full content environment need to call this before
-  // initializing the Compositor.
-  // Some tests expect pixel output, and they should pass false for
-  // |allow_test_contexts|. Most unit tests should pass true. Once this has been
-  // called, the Initialize() and Terminate() methods should be used as normal.
-  static void InitializeContextFactoryForTests(bool allow_test_contexts);
-
   static void Initialize();
   static bool WasInitializedWithThread();
   static scoped_refptr<base::MessageLoopProxy> GetCompositorMessageLoop();
Property changes on: trunk/src/ui/compositor/compositor.h
___________________________________________________________________
Deleted: svn:mergeinfo