Index: ash/root_window_controller_unittest.cc |
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc |
index 12b27e82b419d272393630c50dc5d7b4eb02bb0c..1f50afd54fe06fc5e147fae055e9e032a8cdb9b8 100644 |
--- a/ash/root_window_controller_unittest.cc |
+++ b/ash/root_window_controller_unittest.cc |
@@ -61,8 +61,24 @@ aura::Window* GetModalContainer(aura::RootWindow* root_window) { |
} // namespace |
namespace test { |
+class RootWindowControllerTest : public test::AshTestBase { |
+ public: |
+ RootWindowControllerTest() {} |
+ virtual ~RootWindowControllerTest() {} |
+ |
+ virtual void SetUp() OVERRIDE { |
+ internal::DisplayController::SetExtendedDesktopEnabled(true); |
+ AshTestBase::SetUp(); |
+ } |
-typedef test::AshTestBase RootWindowControllerTest; |
+ virtual void TearDown() OVERRIDE { |
+ AshTestBase::TearDown(); |
+ internal::DisplayController::SetExtendedDesktopEnabled(false); |
+ } |
+ |
+ private: |
+ DISALLOW_COPY_AND_ASSIGN(RootWindowControllerTest); |
+}; |
TEST_F(RootWindowControllerTest, MoveWindows_Basic) { |
UpdateDisplay("600x600,500x500"); |