ui/compositor: move the browser compositor thread to the ContextFactory

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 3cc02690d967f33812a0fc41dc2abbe409a7ef42..bc5cefd8a7603a4c4aefc8ba3bb961b519116025 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -96,6 +96,10 @@ class COMPOSITOR_EXPORT ContextFactory {
 
   // Gets the shared bitmap manager for software mode.
   virtual cc::SharedBitmapManager* GetSharedBitmapManager() = 0;
+
+  // Gets the compositor message loop, or NULL if not using threaded
+  // compositing.
+  virtual base::MessageLoopProxy* GetCompositorMessageLoop() = 0;
 };
 
 // This class represents a lock on the compositor, that can be used to prevent
@@ -135,11 +139,6 @@ class COMPOSITOR_EXPORT Compositor
   explicit Compositor(gfx::AcceleratedWidget widget);
   virtual ~Compositor();
 
-  static void Initialize();
-  static bool WasInitializedWithThread();
-  static scoped_refptr<base::MessageLoopProxy> GetCompositorMessageLoop();
-  static void Terminate();
-
   // Schedules a redraw of the layer tree associated with this compositor.
   void ScheduleDraw();
 
@@ -265,6 +264,7 @@ class COMPOSITOR_EXPORT Compositor
   gfx::AcceleratedWidget widget_;
   scoped_refptr<cc::Layer> root_web_layer_;
   scoped_ptr<cc::LayerTreeHost> host_;
+  scoped_refptr<base::MessageLoopProxy> compositor_thread_loop_;
 
   // The manager of vsync parameters for this compositor.
   scoped_refptr<CompositorVSyncManager> vsync_manager_;