Disabling extended desktop (by default).

ash/extended_desktop_unittest.cc

Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 387e16858b02855e8d60ce6d8a66622528e2b9de..63c2c364164a778ed934298f4d82eff24a930d85 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -61,14 +61,32 @@ class ModalWidgetDelegate : public views::WidgetDelegateView {
   DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
 };
 
-internal::MultiDisplayManager* GetDisplayManager() {
-  return static_cast<internal::MultiDisplayManager*>(
-      aura::Env::GetInstance()->display_manager());
-}
-
 }  // namespace
 
-typedef test::AshTestBase ExtendedDesktopTest;
+class ExtendedDesktopTest : public test::AshTestBase {
+ public:
+  ExtendedDesktopTest() {}
+  virtual ~ExtendedDesktopTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    internal::DisplayController::SetExtendedDesktopEnabled(true);
+    AshTestBase::SetUp();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    AshTestBase::TearDown();
+    internal::DisplayController::SetExtendedDesktopEnabled(false);
+  }
+
+ protected:
+  internal::MultiDisplayManager* display_manager() {
+    return static_cast<internal::MultiDisplayManager*>(
+        aura::Env::GetInstance()->display_manager());
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ExtendedDesktopTest);
+};
 
 // Test conditions that root windows in extended desktop mode
 // must satisfy.
@@ -445,10 +463,10 @@ TEST_F(ExtendedDesktopTest, ConvertPoint) {
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   gfx::Display& display_1 =
-      GetDisplayManager()->FindDisplayForRootWindow(root_windows[0]);
+      display_manager()->FindDisplayForRootWindow(root_windows[0]);
   EXPECT_EQ("0,0", display_1.bounds().origin().ToString());
   gfx::Display& display_2 =
-      GetDisplayManager()->FindDisplayForRootWindow(root_windows[1]);
+      display_manager()->FindDisplayForRootWindow(root_windows[1]);
   EXPECT_EQ("1000,0", display_2.bounds().origin().ToString());
 
   aura::Window* d1 =
@@ -478,7 +496,7 @@ TEST_F(ExtendedDesktopTest, ConvertPoint) {
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
       internal::DisplayController::BOTTOM);
 
-  display_2 = GetDisplayManager()->FindDisplayForRootWindow(root_windows[1]);
+  display_2 = display_manager()->FindDisplayForRootWindow(root_windows[1]);
   EXPECT_EQ("0,600", display_2.bounds().origin().ToString());
 
   // Convert point in Root2's window to Root1's window Coord.