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

ash/root_window_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/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"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
@@ skipping 126 matching lines @@
   }
 
   aura::Window* GetModalContainer(aura::RootWindow* root_window) {
     return Shell::GetContainer(
         root_window,
         ash::internal::kShellWindowId_SystemModalContainer);
   }
 };
 
 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;
 
   UpdateDisplay("600x600,500x500");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   internal::RootWindowController* controller =
       Shell::GetPrimaryRootWindowController();
   internal::ShelfLayoutManager* shelf_layout_manager =
       controller->GetShelfLayoutManager();
   shelf_layout_manager->SetAutoHideBehavior(
@@ skipping 403 matching lines @@
     BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
     event_generator.ClickLeftButton();
     expected_mouse_presses++;
     EXPECT_EQ(expected_mouse_presses, main_delegate->mouse_presses());
     UnblockUserSession();
   }
 }
 
 }  // namespace test
 }  // namespace ash