Index: athena/test/athena_test_helper.cc |
diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc |
index f8916a174426c1385d5f6cda593e337286879442..6a9121aa54f431a421b9d7423574aefd112788e0 100644 |
--- a/athena/test/athena_test_helper.cc |
+++ b/athena/test/athena_test_helper.cc |
@@ -8,6 +8,7 @@ |
#include "athena/screen/public/screen_manager.h" |
#include "athena/test/sample_activity_factory.h" |
#include "athena/test/test_app_model_builder.h" |
+#include "athena/test/test_screen_manager_delegate.h" |
#include "base/command_line.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
@@ -70,6 +71,8 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) { |
test_screen_.reset(aura::TestScreen::Create(host_size)); |
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); |
host_.reset(test_screen_->CreateHostForPrimaryDisplay()); |
+ screen_manager_delegate_.reset( |
+ new TestScreenManagerDelegate(test_screen_.get())); |
input_method_filter_.reset(new ::wm::InputMethodEventFilter( |
root_window()->GetHost()->GetAcceleratedWidget())); |
@@ -87,7 +90,7 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) { |
// Ensure width != height so tests won't confuse them. |
host()->SetBounds(gfx::Rect(host_size)); |
- athena::StartAthenaEnv(root_window()); |
+ athena::StartAthenaEnv(root_window(), screen_manager_delegate_.get()); |
athena::StartAthenaSession(new SampleActivityFactory(), |
new TestAppModelBuilder()); |
} |