ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

ash/root_window_controller_unittest.cc

Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index b4c16e35f2ad1ffa49014c8bff1208a0a3099133..4c724f26d3263608a2e1edd57e2dedacc82a1b2b 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/root_window_controller.h"
 
+#include "ash/ash_switches.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ -150,6 +151,10 @@ class RootWindowControllerTest : public test::AshTestBase {
 };
 
 TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
+  // Disabled here as the work_area insets here are hard coded they are

[James Cook, 2013/08/22 00:19:12]

nit: period after "hard coded"

[Harry McCleave, 2013/08/27 00:37:00]

Done.

+  // tested in the alternate shelf layout in launcher_view unit tests.
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      ash::switches::kAshDisableAlternateShelfLayout);
   if (!SupportsMultipleDisplays())
     return;