Temporarily adds another constructor to Compositor

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index ad00a419ce9d67c22b8efeeadd953f7b9da445e6..3c9ea047dcd33ccac94eb190f6fc014fd5d2c77a 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -136,9 +136,15 @@ class COMPOSITOR_EXPORT Compositor
     : NON_EXPORTED_BASE(public cc::LayerTreeHostClient),
       NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient) {
  public:
+  // This is deprecated, and will be removed shortly.
+  // TODO(sky): remove this.
   explicit Compositor(gfx::AcceleratedWidget widget);
+  Compositor(gfx::AcceleratedWidget widget,
+             ui::ContextFactory* context_factory);
   virtual ~Compositor();
 
+  ui::ContextFactory* context_factory() { return context_factory_; }
+
   // Schedules a redraw of the layer tree associated with this compositor.
   void ScheduleDraw();
 
@@ -248,6 +254,11 @@ class COMPOSITOR_EXPORT Compositor
   friend class base::RefCounted<Compositor>;
   friend class CompositorLock;
 
+  // Called from both constructors. It's temporary while we have both
+  // constructors.
+  // TODO(sky): nuke this.
+  void Init();
+
   // Called by CompositorLock.
   void UnlockCompositor();
 
@@ -259,6 +270,8 @@ class COMPOSITOR_EXPORT Compositor
 
   gfx::Size size_;
 
+  ui::ContextFactory* context_factory_;
+
   // The root of the Layer tree drawn by this compositor.
   Layer* root_layer_;