Changes code using Compositor to pass in ContextFactory

ash/test/ash_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 ASH_TEST_ASH_TEST_HELPER_H_
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace aura {
 class Window;
 }  // namespace aura
 
 namespace base {
 class MessageLoopForUI;
 }  // namespace base
 
 namespace ui {
+class ContextFactory;
 class ScopedAnimationDurationScaleMode;
 }  // namespace ui
 
 namespace views {
 class ViewsDelegate;
 }
 
 namespace ash {
 namespace test {
 
@@ skipping 32 matching lines @@
   }
 
   // True if the running environment supports multiple displays,
   // or false otherwise (e.g. win8 bot).
   static bool SupportsMultipleDisplays();
 
   // True if the running environment supports host window resize,
   // or false otherwise (e.g. win8 bot).
   static bool SupportsHostWindowResize();
 
+  ui::ContextFactory* context_factory() { return context_factory_; }
+
  private:
+  ui::ContextFactory* context_factory_;
   base::MessageLoopForUI* message_loop_;  // Not owned.
   TestShellDelegate* test_shell_delegate_;  // Owned by ash::Shell.
   scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
 
   // Owned by ash::AcceleratorController
   TestScreenshotDelegate* test_screenshot_delegate_;
 
   scoped_ptr<views::ViewsDelegate> views_delegate_;
 
   // Check if DBus Thread Manager was initialized here.
   bool dbus_thread_manager_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_HELPER_H_