Changes code using Compositor to pass in ContextFactory

ash/host/ash_window_tree_host_x11_unittest.cc

 // Copyright 2014 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 "ash/host/ash_window_tree_host_x11.h"
 
 #undef None
 #undef Bool
 
 #include "base/sys_info.h"
@@ skipping 50 matching lines @@
 
 // Send X touch events to one WindowTreeHost. The WindowTreeHost's
 // delegate will get corresponding ui::TouchEvent if the touch events
 // are targeting this WindowTreeHost.
 TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) {
   // Fake a ChromeOS running env.
   const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 
   scoped_ptr<aura::WindowTreeHostX11> window_tree_host(
-      new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
+      new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700), context_factory()));
   window_tree_host->InitHost();
   scoped_ptr<RootWindowEventHandler> handler(
       new RootWindowEventHandler(window_tree_host.get()));
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, handler->last_touch_type());
@@ skipping 45 matching lines @@
 
 // Send X touch events to two WindowTreeHost. The WindowTreeHost which is
 // the event target of the X touch events should generate the corresponding
 // ui::TouchEvent for its delegate.
 TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
   // Fake a ChromeOS running env.
   const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 
   scoped_ptr<aura::WindowTreeHostX11> window_tree_host1(
-      new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
+      new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700), context_factory()));
   window_tree_host1->InitHost();
   scoped_ptr<RootWindowEventHandler> handler1(
       new RootWindowEventHandler(window_tree_host1.get()));
 
   int host2_y_offset = 1700;
   scoped_ptr<aura::WindowTreeHostX11> window_tree_host2(
-      new AshWindowTreeHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080)));
+      new AshWindowTreeHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080),
+                               context_factory()));
   window_tree_host2->InitHost();
   scoped_ptr<RootWindowEventHandler> handler2(
       new RootWindowEventHandler(window_tree_host2.get()));
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, handler1->last_touch_type());
@@ skipping 85 matching lines @@
   handler2.reset();
 
   // Revert the CrOS testing env otherwise the following non-CrOS aura
   // tests will fail.
   // Fake a ChromeOS running env.
   kLsbRelease = "";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 }
 
 }  // namespace aura