Makes Env contain a ContextFactory

ui/views/test/views_test_base.cc

 // Copyright (c) 2012 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 "ui/views/test/views_test_base.h"
 
 #include "base/run_loop.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/compositor/test/context_factories_for_test.h"
@@ skipping 13 matching lines @@
       << "You have overridden TearDown but never called super class's TearDown";
 }
 
 void ViewsTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
   if (!views_delegate_.get())
     views_delegate_.reset(new TestViewsDelegate());
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
-  ui::InitializeContextFactoryForTests(enable_pixel_output);
+  ui::ContextFactory* context_factory =
+      ui::InitializeContextFactoryForTests(enable_pixel_output);
 
-  test_helper_.reset(ViewsTestHelper::Create(&message_loop_));
+  test_helper_.reset(ViewsTestHelper::Create(&message_loop_, context_factory));
   test_helper_->SetUp();
   ui::InitializeInputMethodForTesting();
 }
 
 void ViewsTestBase::TearDown() {
   ui::Clipboard::DestroyClipboardForCurrentThread();
 
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
   RunPendingMessages();
@@ skipping 15 matching lines @@
   Widget::InitParams params(type);
   params.context = GetContext();
   return params;
 }
 
 gfx::NativeView ViewsTestBase::GetContext() {
   return test_helper_->GetContext();
 }
 
 }  // namespace views