Changes code using Compositor to pass in ContextFactory

ui/aura/window_tree_host_win.cc

 // Copyright (c) 2012 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_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
@@ skipping 12 matching lines @@
 using std::min;
 
 namespace aura {
 namespace {
 
 bool use_popup_as_root_window_for_test = false;
 
 }  // namespace
 
 // static
-WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
-  return new WindowTreeHostWin(bounds);
+WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds,
+                                       ui::ContextFactory* context_factory) {
+  return new WindowTreeHostWin(bounds, context_factory);
 }
 
 // static
 gfx::Size WindowTreeHost::GetNativeScreenSize() {
   return gfx::Size(GetSystemMetrics(SM_CXSCREEN),
                    GetSystemMetrics(SM_CYSCREEN));
 }
 
-WindowTreeHostWin::WindowTreeHostWin(const gfx::Rect& bounds)
+WindowTreeHostWin::WindowTreeHostWin(const gfx::Rect& bounds,
+                                     ui::ContextFactory* context_factory)
     : has_capture_(false) {
   if (use_popup_as_root_window_for_test)
     set_window_style(WS_POPUP);
   Init(NULL, bounds);
   SetWindowText(hwnd(), L"aura::RootWindow!");
-  CreateCompositor(GetAcceleratedWidget());
+  CreateCompositor(GetAcceleratedWidget(), context_factory);
 }
 
 WindowTreeHostWin::~WindowTreeHostWin() {
   DestroyCompositor();
   DestroyDispatcher();
   DestroyWindow(hwnd());
 }
 
 ui::EventSource* WindowTreeHostWin::GetEventSource() {
   return this;
@@ skipping 169 matching lines @@
 namespace test {
 
 // static
 void SetUsePopupAsRootWindowForTest(bool use) {
   use_popup_as_root_window_for_test = use;
 }
 
 }  // namespace test
 
 }  // namespace aura