Enabling Extended Deskop 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 fdfd7892d1ac08816f2b2f93b1919a4c15e95c65..2b1108df8970fbbb9c82f520877ac3ebc701bcd1 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -61,32 +61,14 @@ class ModalWidgetDelegate : public views::WidgetDelegateView {
   DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
 };
 
-}  // namespace
-
-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);
-  }
+internal::MultiDisplayManager* GetDisplayManager() {
+  return static_cast<internal::MultiDisplayManager*>(
+      aura::Env::GetInstance()->display_manager());
+}
 
- protected:
-  internal::MultiDisplayManager* display_manager() {
-    return static_cast<internal::MultiDisplayManager*>(
-        aura::Env::GetInstance()->display_manager());
-  }
+}  // namespace
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(ExtendedDesktopTest);
-};
+typedef test::AshTestBase ExtendedDesktopTest;
 
 // Test conditions that root windows in extended desktop mode
 // must satisfy.
@@ -463,10 +445,10 @@ TEST_F(ExtendedDesktopTest, ConvertPoint) {
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   gfx::Display& display_1 =
-      display_manager()->FindDisplayForRootWindow(root_windows[0]);
+      GetDisplayManager()->FindDisplayForRootWindow(root_windows[0]);
   EXPECT_EQ("0,0", display_1.bounds().origin().ToString());
   gfx::Display& display_2 =
-      display_manager()->FindDisplayForRootWindow(root_windows[1]);
+      GetDisplayManager()->FindDisplayForRootWindow(root_windows[1]);
   EXPECT_EQ("1000,0", display_2.bounds().origin().ToString());
 
   aura::Window* d1 =
@@ -496,7 +478,7 @@ TEST_F(ExtendedDesktopTest, ConvertPoint) {
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
       internal::DisplayController::BOTTOM);
 
-  display_2 = display_manager()->FindDisplayForRootWindow(root_windows[1]);
+  display_2 = GetDisplayManager()->FindDisplayForRootWindow(root_windows[1]);
   EXPECT_EQ("0,600", display_2.bounds().origin().ToString());
 
   // Convert point in Root2's window to Root1's window Coord.