Changes code using Compositor to pass in ContextFactory

ui/aura/window_tree_host.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window_tree_host.h"
 
 #include "base/debug/trace_event.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
@@ skipping 26 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHost, public:
 
 WindowTreeHost::~WindowTreeHost() {
   DCHECK(!compositor_) << "compositor must be destroyed before root window";
 }
 
 #if defined(OS_ANDROID)
 // static
-WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
+WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds,
+                                       ui::ContextFactory* context_factory) {
   // This is only hit for tests and ash, right now these aren't an issue so
   // adding the CHECK.
   // TODO(sky): decide if we want a factory.
   CHECK(false);
   return NULL;
 }
 #endif
 
 // static
 WindowTreeHost* WindowTreeHost::GetForAcceleratedWidget(
@@ skipping 132 matching lines @@
   // isn't called from WED, and WED isn't a subclass of Window. So it seems
   // like we could just rely on ~Window now.
   // Destroy child windows while we're still valid. This is also done by
   // ~Window, but by that time any calls to virtual methods overriden here (such
   // as GetRootWindow()) result in Window's implementation. By destroying here
   // we ensure GetRootWindow() still returns this.
   //window()->RemoveOrDestroyChildren();
 }
 
 void WindowTreeHost::CreateCompositor(
-    gfx::AcceleratedWidget accelerated_widget) {
-  compositor_.reset(new ui::Compositor(GetAcceleratedWidget()));
+    gfx::AcceleratedWidget accelerated_widget,
+    ui::ContextFactory* context_factory) {
+  compositor_.reset(
+      new ui::Compositor(GetAcceleratedWidget(), context_factory));
   DCHECK(compositor_.get());
   // TODO(beng): I think this setup should probably all move to a "accelerated
   // widget available" function.
   if (!dispatcher()) {
     window()->Init(WINDOW_LAYER_NOT_DRAWN);
     window()->set_host(this);
     window()->SetName("RootWindow");
     window()->SetEventTargeter(
         scoped_ptr<ui::EventTargeter>(new WindowTargeter()));
     prop_.reset(new ui::ViewProp(GetAcceleratedWidget(),
@@ skipping 49 matching lines @@
   client::CursorClient* cursor_client = client::GetCursorClient(window());
   if (cursor_client) {
     const gfx::Display& display =
         gfx::Screen::GetScreenFor(window())->GetDisplayNearestWindow(window());
     cursor_client->SetDisplay(display);
   }
   dispatcher()->OnCursorMovedToRootLocation(root_location);
 }
 
 }  // namespace aura