| Index: chrome/test/base/browser_with_test_window_test.cc
|
| diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
|
| index e0a81cb04b10edd5a4e65e219a0c6646bb472c83..ca71fb55c783fa937cb07c907883e36641884647 100644
|
| --- a/chrome/test/base/browser_with_test_window_test.cc
|
| +++ b/chrome/test/base/browser_with_test_window_test.cc
|
| @@ -23,7 +23,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"
|
| #endif
|
| @@ -49,8 +49,7 @@ void BrowserWithTestWindowTest::SetUp() {
|
| window_.reset(new TestBrowserWindow(browser()));
|
| browser_->SetWindowForTesting(window_.get());
|
| #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()));
|
|
|