| Index: ui/views/test/views_test_base.cc
|
| diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
|
| index 1e05f503532fdff629a1aa9f1cb7b21a95ecd256..996582f6e523fe14a91cec0a532a1372037a1ac5 100644
|
| --- a/ui/views/test/views_test_base.cc
|
| +++ b/ui/views/test/views_test_base.cc
|
| @@ -14,7 +14,7 @@
|
| #include "ui/aura/env.h"
|
| #include "ui/aura/monitor_manager.h"
|
| #include "ui/aura/root_window.h"
|
| -#include "ui/aura/test/single_monitor_manager.h"
|
| +#include "ui/aura/single_monitor_manager.h"
|
| #include "ui/aura/test/test_activation_client.h"
|
| #include "ui/aura/test/test_stacking_client.h"
|
| #include "ui/base/ime/input_method.h"
|
| @@ -83,8 +83,7 @@ void ViewsTestBase::SetUp() {
|
| if (!views_delegate_.get())
|
| views_delegate_.reset(new TestViewsDelegate());
|
| #if defined(USE_AURA)
|
| - aura::Env::GetInstance()->SetMonitorManager(
|
| - new aura::test::SingleMonitorManager);
|
| + aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
|
| root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
|
| #if defined(USE_ASH)
|
| gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
|
|
|