Changes code using Compositor to pass in ContextFactory

ash/test/ash_test_helper.h

Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index b42cc7254347724c42ff819aa02bb99684c3be6c..22c34cc2533b2ed13faa0879314f17cb63289055 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -17,6 +17,7 @@ class MessageLoopForUI;
 }  // namespace base
 
 namespace ui {
+class ContextFactory;
 class ScopedAnimationDurationScaleMode;
 }  // namespace ui
 
@@ -69,7 +70,10 @@ class AshTestHelper {
   // 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_;