Changes code using Compositor to pass in ContextFactory

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index b709b83dfde257b56cae9aea14363aae34aff7c4..1ba8c2d71174c9858b112753d755c1dbfc2ebde7 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -80,7 +80,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
  protected:
   // Overridden from DesktopWindowTreeHost:
   virtual void Init(aura::Window* content_window,
-                    const Widget::InitParams& params) OVERRIDE;
+                    const Widget::InitParams& params,
+                    ui::ContextFactory* context_factory) OVERRIDE;
   virtual void OnNativeWidgetCreated(const Widget::InitParams& params) OVERRIDE;
   virtual scoped_ptr<corewm::Tooltip> CreateTooltip() OVERRIDE;
   virtual scoped_ptr<aura::client::DragDropClient>
@@ -160,7 +161,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
 private:
   // Initializes our X11 surface to draw on. This method performs all
   // initialization related to talking to the X11 server.
-  void InitX11Window(const Widget::InitParams& params);
+  void InitX11Window(const Widget::InitParams& params,
+                     ui::ContextFactory* context_factory);
 
   // Creates an aura::WindowEventDispatcher to contain the |content_window|,
   // along with all aura client objects that direct behavior.