Changes code using Compositor to pass in ContextFactory

ui/views/test/views_test_helper_aura.cc

Index: ui/views/test/views_test_helper_aura.cc
diff --git a/ui/views/test/views_test_helper_aura.cc b/ui/views/test/views_test_helper_aura.cc
index e78e7a9d195583c2a04040739f69ae265a6b6a7c..2f50b86f56b4ba5335888a789bba9abd6f71755e 100644
--- a/ui/views/test/views_test_helper_aura.cc
+++ b/ui/views/test/views_test_helper_aura.cc
@@ -12,11 +12,14 @@
 namespace views {
 
 // static
-ViewsTestHelper* ViewsTestHelper::Create(base::MessageLoopForUI* message_loop) {
-  return new ViewsTestHelperAura(message_loop);
+ViewsTestHelper* ViewsTestHelper::Create(base::MessageLoopForUI* message_loop,
+                                         ui::ContextFactory* context_factory) {
+  return new ViewsTestHelperAura(message_loop, context_factory);
 }
 
-ViewsTestHelperAura::ViewsTestHelperAura(base::MessageLoopForUI* message_loop) {
+ViewsTestHelperAura::ViewsTestHelperAura(base::MessageLoopForUI* message_loop,
+                                         ui::ContextFactory* context_factory)
+    : context_factory_(context_factory) {
   aura_test_helper_.reset(new aura::test::AuraTestHelper(message_loop));
 }
 
@@ -24,7 +27,7 @@ ViewsTestHelperAura::~ViewsTestHelperAura() {
 }
 
 void ViewsTestHelperAura::SetUp() {
-  aura_test_helper_->SetUp();
+  aura_test_helper_->SetUp(context_factory_);
   new wm::DefaultActivationClient(aura_test_helper_->root_window());
   wm_state_.reset(new wm::WMState);
 }