| Index: ui/aura/test/aura_test_helper.cc
|
| diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
|
| index 5823922d180cd88b53879c25db4b0f6e8a0592e1..a393808270d3322436f7e0223ef585f6d9ef56f3 100644
|
| --- a/ui/aura/test/aura_test_helper.cc
|
| +++ b/ui/aura/test/aura_test_helper.cc
|
| @@ -52,7 +52,7 @@ AuraTestHelper::~AuraTestHelper() {
|
| << "AuraTestHelper::TearDown() never called.";
|
| }
|
|
|
| -void AuraTestHelper::SetUp() {
|
| +void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
|
| setup_called_ = true;
|
|
|
| Env::CreateInstance(true);
|
| @@ -65,7 +65,7 @@ void AuraTestHelper::SetUp() {
|
|
|
| test_screen_.reset(TestScreen::Create());
|
| gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
|
| - host_.reset(test_screen_->CreateHostForPrimaryDisplay());
|
| + host_.reset(test_screen_->CreateHostForPrimaryDisplay(context_factory));
|
|
|
| focus_client_.reset(new TestFocusClient);
|
| client::SetFocusClient(root_window(), focus_client_.get());
|
|
|