diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 21:47:58 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 21:47:58 +0000 |
| commit | fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9 (patch) | |
| tree | 1d9c539da5aab9ef57883d5f871d91bffdbd9f6b /ash/test/ash_test_helper.cc | |
| parent | 15b4290d997471abce904d693291808e8205ddd3 (diff) | |
| download | chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.zip chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.tar.gz chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.tar.bz2 | |
Makes Env contain a ContextFactory
This way when creating the Compositor we can supply the ContextFactory
from the thread local Env to it. This is part of making aura thread
safe.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/296053009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 3dd9455..ceb2910 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -65,7 +65,8 @@ void AshTestHelper::SetUp(bool start_session) { ui::InitializeInputMethodForTesting(); bool enable_pixel_output = false; - ui::InitializeContextFactoryForTests(enable_pixel_output); + ui::ContextFactory* context_factory = + ui::InitializeContextFactoryForTests(enable_pixel_output); // Creates Shell and hook with Desktop. if (!test_shell_delegate_) @@ -87,6 +88,7 @@ void AshTestHelper::SetUp(bool start_session) { #endif ShellInitParams init_params; init_params.delegate = test_shell_delegate_; + init_params.context_factory = context_factory; ash::Shell::CreateInstance(init_params); aura::test::EnvTestHelper(aura::Env::GetInstance()).SetInputStateLookup( scoped_ptr<aura::InputStateLookup>()); |