Changes code using Compositor to pass in ContextFactory

ui/wm/test/wm_test_helper.cc

 // Copyright 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/wm/test/wm_test_helper.h"
 
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/input_method_event_filter.h"
 
 namespace wm {
 
-WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) {
+WMTestHelper::WMTestHelper(const gfx::Size& default_window_size,
+                           ui::ContextFactory* context_factory) {
   aura::Env::CreateInstance(true);
-  host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size)));
+  host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size),
+                                           context_factory));
   host_->InitHost();
   aura::client::SetWindowTreeClient(host_->window(), this);
 
   focus_client_.reset(new aura::test::TestFocusClient);
   aura::client::SetFocusClient(host_->window(), focus_client_.get());
 
   root_window_event_filter_.reset(new wm::CompoundEventFilter);
   host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
 
   input_method_filter_.reset(new wm::InputMethodEventFilter(
@@ skipping 11 matching lines @@
   root_window_event_filter_->RemoveHandler(input_method_filter_.get());
 }
 
 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
                                              aura::Window* window,
                                              const gfx::Rect& bounds) {
   return host_->window();
 }
 
 }  // namespace wm