Enabling Extended Deskop 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/display_manager.h"
 #include "ui/aura/env.h"
@@ skipping 10 matching lines @@
       Shell::GetAllRootWindows()[0]);
 }
 
 gfx::Display GetSecondaryDisplay() {
   return gfx::Screen::GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[1]);
 }
 
 }  // namespace
 
-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);
-};
+typedef test::AshTestBase 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 141 matching lines @@
   controller->set_dont_warp_mouse(false);
   is_warped = controller->WarpMouseCursorIfNecessary(root_windows[0],
                                                      gfx::Point(499, 11));
   EXPECT_TRUE(is_warped);
   EXPECT_EQ("501,11",
             aura::Env::GetInstance()->last_mouse_location().ToString());
 }
 
 }  // namespace test
 }  // namespace ash