Changes code using Compositor to pass in ContextFactory

ui/aura/test/aura_test_base.cc

Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index e49a1e049a64bb833dd050094c4e9aca4740f9bf..79c31dd27436592b3497493ea07c898cbcc2e6c2 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -19,7 +19,8 @@ namespace test {
 
 AuraTestBase::AuraTestBase()
     : setup_called_(false),
-      teardown_called_(false) {
+      teardown_called_(false),
+      context_factory_(NULL) {
 }
 
 AuraTestBase::~AuraTestBase() {
@@ -73,10 +74,10 @@ void AuraTestBase::SetUp() {
 
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
-  ui::InitializeContextFactoryForTests(enable_pixel_output);
+  context_factory_ = ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   helper_.reset(new AuraTestHelper(&message_loop_));
-  helper_->SetUp();
+  helper_->SetUp(context_factory_);
 }
 
 void AuraTestBase::TearDown() {