Changes code using Compositor to pass in ContextFactory

ui/aura/remote_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/remote_window_tree_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
@@ skipping 136 matching lines @@
   aura::RemoteWindowTreeHostWin::Instance()->HandleMetroExit();
 }
 
 RemoteWindowTreeHostWin* g_instance = NULL;
 
 // static
 RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() {
   return g_instance;
 }
 
-RemoteWindowTreeHostWin::RemoteWindowTreeHostWin()
+RemoteWindowTreeHostWin::RemoteWindowTreeHostWin(
+    ui::ContextFactory* context_factory)
     : remote_window_(NULL),
       host_(NULL),
       ignore_mouse_moves_until_set_cursor_ack_(false),
       event_flags_(0),
       window_size_(aura::WindowTreeHost::GetNativeScreenSize()) {
   CHECK(!g_instance);
   g_instance = this;
   prop_.reset(new ui::ViewProp(NULL, kWindowTreeHostWinKey, this));
-  CreateCompositor(GetAcceleratedWidget());
+  CreateCompositor(GetAcceleratedWidget(), context_factory);
 }
 
 RemoteWindowTreeHostWin::~RemoteWindowTreeHostWin() {
   DestroyCompositor();
   DestroyDispatcher();
   DCHECK_EQ(g_instance, this);
   g_instance = NULL;
 }
 
 // static
 bool RemoteWindowTreeHostWin::IsValid() {
   return Instance()->remote_window_ != NULL;
 }
 
 void RemoteWindowTreeHostWin::SetRemoteWindowHandle(HWND remote_window) {
   remote_window_ = remote_window;
 }
 
 void RemoteWindowTreeHostWin::Connected(IPC::Sender* host) {
   CHECK(host_ == NULL);
   DCHECK(remote_window_);
   host_ = host;
   // Recreate the compositor for the target surface represented by the
   // remote_window HWND.
-  CreateCompositor(remote_window_);
+  CreateCompositor(remote_window_, compositor()->context_factory());
   InitCompositor();
 }
 
 void RemoteWindowTreeHostWin::Disconnected() {
   // Don't CHECK here, Disconnected is called on a channel error which can
   // happen before we're successfully Connected.
   if (!host_)
     return;
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
@@ skipping 530 matching lines @@
 }
 
 void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) {
   if (flags == event_flags_)
     return;
   event_flags_ = flags;
   SetVirtualKeyStates(event_flags_);
 }
 
 }  // namespace aura