diff options
| author | ben <ben@chromium.org> | 2015-09-25 21:37:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-26 04:38:17 +0000 |
| commit | 0d6be2d4fb4029869eb06f2d3b91e6c22eaafb77 (patch) | |
| tree | 73e2d2ca183a2362e0cbe791d21dbaa2b9ddd285 /ash/test/ash_test_helper.cc | |
| parent | 831b37b63f4809507e53dafc11fea7f943766f96 (diff) | |
| download | chromium_src-0d6be2d4fb4029869eb06f2d3b91e6c22eaafb77.zip chromium_src-0d6be2d4fb4029869eb06f2d3b91e6c22eaafb77.tar.gz chromium_src-0d6be2d4fb4029869eb06f2d3b91e6c22eaafb77.tar.bz2 | |
Replace use of BrowserThread::GetBlockingPool() with Shell::blocking_pool()
R=sky@chromium.org
http://crbug.com/332504
Review URL: https://codereview.chromium.org/1370813002
Cr-Commit-Position: refs/heads/master@{#350984}
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 177f3ad..d884547 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -17,6 +17,7 @@ #include "ash/test/test_shell_delegate.h" #include "ash/test/test_system_tray_delegate.h" #include "base/run_loop.h" +#include "content/public/browser/browser_thread.h" #include "ui/aura/env.h" #include "ui/aura/input_state_lookup.h" #include "ui/aura/test/env_test_helper.h" @@ -94,6 +95,7 @@ void AshTestHelper::SetUp(bool start_session) { ShellInitParams init_params; init_params.delegate = test_shell_delegate_; init_params.context_factory = context_factory; + init_params.blocking_pool = content::BrowserThread::GetBlockingPool(); ash::Shell::CreateInstance(init_params); aura::test::EnvTestHelper(aura::Env::GetInstance()).SetInputStateLookup( scoped_ptr<aura::InputStateLookup>()); |