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

chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

 // Copyright 2013 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/launcher/launcher.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 31 matching lines @@
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 gfx::Rect GetChromeIconBoundsForRootWindow(aura::RootWindow* root_window) {
   ash::Launcher* launcher = ash::Launcher::ForWindow(root_window);
   const ash::internal::LauncherView* launcher_view =
       launcher->GetLauncherViewForTest();
   const views::ViewModel* view_model = launcher_view->view_model_for_test();
 
   EXPECT_EQ(2, view_model->view_size());
-  return view_model->view_at(0)->GetBoundsInScreen();
+  return view_model->view_at(1)->GetBoundsInScreen();
 }
 
 void OpenBrowserUsingShelfOnRootWindow(aura::RootWindow* root_window) {
   aura::test::EventGenerator generator(root_window);
   gfx::Point center =
       GetChromeIconBoundsForRootWindow(root_window).CenterPoint();
   gfx::Display display =
       ash::Shell::GetScreen()->GetDisplayNearestWindow(root_window);
   const gfx::Point& origin = display.bounds().origin();
   center.Offset(- origin.x(), - origin.y());
   generator.MoveMouseTo(center);
   generator.ClickLeftButton();
 }
 
 }  // namespace
 
 #if defined(OS_WIN)
-#define MAYBE_OpenBrowserUsingShelfOnOhterDisplay DISABLED_OpenBrowserUsingShelfOnOhterDisplay
-#define MAYBE_OpenBrowserUsingContextMenuOnOhterDisplay DISABLED_OpenBrowserUsingContextMenuOnOhterDisplay
+#define MAYBE_OpenBrowserUsingShelfOnOtherDisplay DISABLED_OpenBrowserUsingShelfOnOtherDisplay
+#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay DISABLED_OpenBrowserUsingContextMenuOnOtherDisplay
 #else
-#define MAYBE_OpenBrowserUsingShelfOnOhterDisplay OpenBrowserUsingShelfOnOhterDisplay
-#define MAYBE_OpenBrowserUsingContextMenuOnOhterDisplay OpenBrowserUsingContextMenuOnOhterDisplay
+#define MAYBE_OpenBrowserUsingShelfOnOtherDisplay OpenBrowserUsingShelfOnOtherDisplay
+#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay OpenBrowserUsingContextMenuOnOtherDisplay
 #endif
 
 IN_PROC_BROWSER_TEST_F(WindowSizerTest,
-                       MAYBE_OpenBrowserUsingShelfOnOhterDisplay) {
+                       MAYBE_OpenBrowserUsingShelfOnOtherDisplay) {
   // Don't shutdown when closing the last browser window.
   chrome::StartKeepAlive();
 
   ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
 
   EXPECT_EQ(1u, browser_list->size());
   // Close the browser window so that clicking icon will create a new window.
@@ skipping 67 matching lines @@
   release_point.Offset(50, -120);
   ui_controls::SendMouseMoveNotifyWhenDone(
       chrome_icon.x(), chrome_icon.y(),
       base::Bind(&WindowSizerContextMenuTest::Step1, release_point));
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest,
-                       MAYBE_OpenBrowserUsingContextMenuOnOhterDisplay) {
+                       MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay) {
   // Don't shutdown when closing the last browser window.
   chrome::StartKeepAlive();
 
   views::MenuController::TurnOffMenuSelectionHoldForTest();
 
   ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
 
@@ skipping 13 matching lines @@
 
   // Next new browser must be created on 1st display.
   EXPECT_EQ(2u, browser_list->size());
   EXPECT_EQ(root_windows[0],
             browser_list->get(1)->window()->GetNativeWindow()->GetRootWindow());
   EXPECT_EQ(root_windows[0], ash::Shell::GetActiveRootWindow());
 
   // Balanced with the chrome::StartKeepAlive above.
   chrome::EndKeepAlive();
 }