Enable extended desktop by default.

Added debug only shortcut to activate screen locker.

BUG=123160
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10800095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148297 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 17 deletions

diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 1f50afd..12b27e8 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -61,24 +61,8 @@ aura::Window* GetModalContainer(aura::RootWindow* root_window) {
 }  // namespace
 
 namespace test {
-class RootWindowControllerTest : public test::AshTestBase {
- public:
-  RootWindowControllerTest() {}
-  virtual ~RootWindowControllerTest() {}
-
-  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(RootWindowControllerTest);
-};
+typedef test::AshTestBase RootWindowControllerTest;
 
 TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
   UpdateDisplay("600x600,500x500");