Switch default WM mode to managed

ash/shell_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/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/root_window_layout_manager.h"
@@ skipping 270 matching lines @@
   EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
   lock_widget->Show();
   EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
   lock_modal_widget->Close();
   EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
   lock_widget->Close();
   EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
 }
 
 TEST_F(ShellTest, ComputeWindowMode) {
-  // By default, we use overlapping mode.
+  // By default, we use managed mode.
   Shell* shell = Shell::GetInstance();
   Shell::TestApi test_api(shell);
   CommandLine command_line_blank(CommandLine::NO_PROGRAM);
-  EXPECT_EQ(Shell::MODE_OVERLAPPING,
+  EXPECT_EQ(Shell::MODE_MANAGED,
             test_api.ComputeWindowMode(&command_line_blank));
 
   // Sometimes we force compact mode.
   CommandLine command_line_force(CommandLine::NO_PROGRAM);
   command_line_force.AppendSwitch(switches::kAuraForceCompactWindowMode);
   EXPECT_EQ(Shell::MODE_COMPACT,
             test_api.ComputeWindowMode(&command_line_force));
 
+  // The user can set overlapping mode.
+  CommandLine command_line_overlapping(CommandLine::NO_PROGRAM);
+  command_line_overlapping.AppendSwitchASCII(
+      switches::kAuraWindowMode,
+      switches::kAuraWindowModeOverlapping);
+  EXPECT_EQ(Shell::MODE_OVERLAPPING,
+            test_api.ComputeWindowMode(&command_line_overlapping));
+
   // The user can set compact mode.
   CommandLine command_line_compact(CommandLine::NO_PROGRAM);
   command_line_compact.AppendSwitchASCII(switches::kAuraWindowMode,
                                          switches::kAuraWindowModeCompact);
   EXPECT_EQ(Shell::MODE_COMPACT,
             test_api.ComputeWindowMode(&command_line_compact));
 
   // The user can set managed.
   CommandLine command_line_managed(CommandLine::NO_PROGRAM);
   command_line_managed.AppendSwitchASCII(switches::kAuraWindowMode,
@@ skipping 119 matching lines @@
   EXPECT_FALSE(launcher_widget->IsVisible());
   // Desktop background widget is gone but we have a layer.
   EXPECT_FALSE(test_api.root_window_layout()->background_widget());
   EXPECT_TRUE(test_api.root_window_layout()->background_layer());
 
   // Clean up.
   widget->Close();
 }
 
 }  // namespace ash