Disabling extended desktop (by default).

ash/display/display_controller_unittest.cc

Index: ash/display/display_controller_unittest.cc
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index 73ceaa06dd412d2f74a3a0b455fe8bc62869fc64..48d2babf7b64ab88f9c4af9c7a194db452eea269 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -29,7 +29,24 @@ gfx::Display GetSecondaryDisplay() {
 
 }  // namespace
 
-typedef test::AshTestBase DisplayControllerTest;
+class DisplayControllerTest : public test::AshTestBase {
+ public:
+  DisplayControllerTest() {}
+  virtual ~DisplayControllerTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    internal::DisplayController::SetExtendedDesktopEnabled(true);
+    AshTestBase::SetUp();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    AshTestBase::TearDown();
+    internal::DisplayController::SetExtendedDesktopEnabled(false);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DisplayControllerTest);
+};
 
 #if defined(OS_WIN)
 // TOD(oshima): Windows creates a window with smaller client area.