Changes code using Compositor to pass in ContextFactory

ui/wm/test/wm_test_helper.h

 // 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.
 
 #ifndef UI_WM_TEST_WM_TEST_HELPER_H_
 #define UI_WM_TEST_WM_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window_tree_host.h"
 
 namespace aura {
 class Window;
 class WindowTreeHost;
 namespace client {
 class DefaultCaptureClient;
 class FocusClient;
 }
 }
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
+namespace ui {
+class ContextFactory;
+}
+
 namespace wm {
 
 class CompoundEventFilter;
 class InputMethodEventFilter;
 
 // Creates a minimal environment for running the shell. We can't pull in all of
 // ash here, but we can create attach several of the same things we'd find in
 // the ash parts of the code.
 class WMTestHelper : public aura::client::WindowTreeClient {
  public:
-  explicit WMTestHelper(const gfx::Size& default_window_size);
+  WMTestHelper(const gfx::Size& default_window_size,
+               ui::ContextFactory* context_factory);
   virtual ~WMTestHelper();
 
   aura::WindowTreeHost* host() { return host_.get(); }
 
   // Overridden from client::WindowTreeClient:
   virtual aura::Window* GetDefaultParent(aura::Window* context,
                                          aura::Window* window,
                                          const gfx::Rect& bounds) OVERRIDE;
 
  private:
   scoped_ptr<aura::WindowTreeHost> host_;
 
   scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<wm::InputMethodEventFilter> input_method_filter_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WMTestHelper);
 };
 
 }  // namespace wm
 
 #endif  // UI_WM_TEST_WM_TEST_HELPER_H_