Disabling extended desktop (by default).

ash/display/display_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
@@ skipping 11 matching lines @@
       Shell::GetAllRootWindows()[0]);
 }
 
 gfx::Display GetSecondaryDisplay() {
   return gfx::Screen::GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[1]);
 }
 
 }  // 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.
 // Fix this and enable tests.
 #define MAYBE_SecondaryDisplayLayout DISABLED_SecondaryDisplayLayout
 #define MAYBE_BoundsUpdated DISABLED_BoundsUpdated
 #else
 #define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout
 #define MAYBE_BoundsUpdated BoundsUpdated
 #endif
@@ skipping 60 matching lines @@
   EXPECT_EQ(1, gfx::Screen::GetNumDisplays());
 
   UpdateDisplay("700x700,1000x1000");
   ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
   EXPECT_EQ("0,0 700x700", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,700 1000x1000", GetSecondaryDisplay().bounds().ToString());
 }
 
 }  // namespace test
 }  // namespace ash