- ui::InitializeInputMethodForTesting();
-
- const gfx::Size host_size(800, 600);
- test_screen_.reset(aura::TestScreen::Create(host_size));
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
- host_.reset(test_screen_->CreateHostForPrimaryDisplay());
-
- input_method_filter_.reset(new ::wm::InputMethodEventFilter(
- root_window()->GetHost()->GetAcceleratedWidget()));
- input_method_filter_->SetInputMethodPropertyInRootWindow(
- root_window());
-
- // TODO(oshima): Switch to athena implementation.
- focus_client_.reset(new aura::test::TestFocusClient);
- aura::client::SetFocusClient(root_window(),
- focus_client_.get());
- new ::wm::DefaultActivationClient(root_window());
-
- root_window()->Show();
- // Ensure width != height so tests won't confuse them.
- host()->SetBounds(gfx::Rect(host_size));
-
- athena::StartAthena(root_window(),
- new SampleActivityFactory(),
- new TestAppModelBuilder());
+ // TODO(oshima): Use a BlockingPool task runner.
+ athena::StartAthenaEnv(file_thread_->message_loop_proxy());
+ athena::ExtensionsDelegate::CreateExtensionsDelegateForTest();
+ athena::StartAthenaSession(new SampleActivityFactory(),
+ new TestAppModelBuilder());