Experimental app list: Fixed failing browser tests.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
@@ skipping 38 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
+#include "ui/app_list/views/start_page_view.h"
+#include "ui/app_list/views/tile_item_view.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/test/event_generator.h"
 
 using extensions::AppWindow;
 using extensions::Extension;
 using content::WebContents;
 
 namespace {
@@ skipping 29 matching lines @@
 
   int icon_updates() { return icon_updates_; }
 
  private:
   Profile* profile_;
   int icon_updates_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver);
 };
 
+
+// Click the "All Apps" button from the app launcher start page. Assumes that
+// the app launcher is open to the start page. On the non-experimental launcher,
+// does nothing.
+// |display_origin| is the top-left corner of the active display, in screen
+// coordinates.
+void OnStartPageClickAllAppsButton(ui::test::EventGenerator* generator,
+                                   const gfx::Point& display_origin) {
+  if (!app_list::switches::IsExperimentalAppListEnabled())
+    return;
+
+  ash::test::AppListControllerTestApi controller_test(
+      ash::Shell::GetInstance());
+
+  app_list::StartPageView* start_page_view = controller_test.GetStartPageView();
+  DCHECK(start_page_view);
+
+  app_list::TileItemView* all_apps_button = start_page_view->all_apps_button();
+  gfx::Rect all_apps_rect = all_apps_button->GetBoundsInScreen();
+  all_apps_rect.Offset(-display_origin.x(), -display_origin.y());
+  generator->MoveMouseTo(all_apps_rect.CenterPoint().x(),
+                        all_apps_rect.CenterPoint().y());

[Daniel Erat, 2014/12/02 15:09:57]

nit: fix indenting

[Matt Giuca, 2014/12/03 00:47:50]

Done.

+  generator->ClickLeftButton();
+  base::MessageLoop::current()->RunUntilIdle();
+  // Run Layout() to effectively complete the animation to the apps page.
+  controller_test.LayoutContentsView();
+}
+
 }  // namespace
 
 class LauncherPlatformAppBrowserTest
     : public extensions::PlatformAppBrowserTest {
  protected:
   LauncherPlatformAppBrowserTest() : shelf_(NULL), controller_(NULL) {
   }
 
   virtual ~LauncherPlatformAppBrowserTest() {}
 
@@ skipping 1611 matching lines @@
 // display environment.
 class ShelfAppBrowserTestWithMultiMonitor
     : public ShelfAppBrowserTestNoDefaultBrowser {
  protected:
   ShelfAppBrowserTestWithMultiMonitor() {}
   virtual ~ShelfAppBrowserTestWithMultiMonitor() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) override {
     ShelfAppBrowserTestNoDefaultBrowser::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII("ash-host-window-bounds",
-                                    "800x600,801+0-800x600");
+                                    "800x800,801+0-800x800");
   }
 
  private:
 
   DISALLOW_COPY_AND_ASSIGN(ShelfAppBrowserTestWithMultiMonitor);
 };
 
 // Do basic drag and drop interaction tests between the application list and
 // the launcher in the secondary monitor.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,
@@ skipping 15 matching lines @@
   // Open the app list menu and check that the drag and drop host was set.
   gfx::Rect app_list_bounds =
       test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
   gfx::Display display =
       ash::Shell::GetScreen()->GetDisplayNearestWindow(secondary_root_window);
   const gfx::Point& origin = display.bounds().origin();
   app_list_bounds.Offset(-origin.x(), -origin.y());
 
   generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
                         app_list_bounds.CenterPoint().y());
+  generator.ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
-  generator.ClickLeftButton();
+  EXPECT_TRUE(service->IsAppListVisible());
 
+  // Click the "all apps" button on the start page.
+  OnStartPageClickAllAppsButton(&generator, origin);
   EXPECT_TRUE(service->IsAppListVisible());
+
   app_list::AppsGridView* grid_view =
       ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
           GetRootGridView();
   ASSERT_TRUE(grid_view);
   ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test());
 
   // There should be 2 items in our application list.
   const views::ViewModelT<app_list::AppListItemView>* vm_grid =
       grid_view->view_model_for_test();
   EXPECT_EQ(2, vm_grid->view_size());
@@ skipping 21 matching lines @@
   generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
                         bounds_shelf_1.CenterPoint().y());
   base::MessageLoop::current()->RunUntilIdle();
 
   // Check that a new item got created.
   EXPECT_EQ(3, model_->item_count());
   EXPECT_TRUE(grid_view->forward_events_to_drag_and_drop_host_for_test());
 
   // Move it to an empty slot on grid_view.
   gfx::Rect empty_slot_rect = bounds_grid_1;
-  empty_slot_rect.Offset(0, bounds_grid_1.height());
+  empty_slot_rect.Offset(0, grid_view->GetTotalTileSize().height());
   generator.MoveMouseTo(empty_slot_rect.CenterPoint().x(),
                         empty_slot_rect.CenterPoint().y());
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(2, model_->item_count());
   EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
 
   // Dropping it should keep the shelf as it originally was.
   generator.ReleaseLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(2, model_->item_count());
@@ skipping 114 matching lines @@
   EXPECT_EQ(2, model_->item_count());
   EXPECT_FALSE(service->IsAppListVisible());
 
   // Open the app list menu and check that the drag and drop host was set.
   gfx::Rect app_list_bounds =
       test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
   generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
                         app_list_bounds.CenterPoint().y());
   generator.ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_TRUE(service->IsAppListVisible());
 
+  // Click the "all apps" button on the start page.
+  OnStartPageClickAllAppsButton(&generator, gfx::Point());
   EXPECT_TRUE(service->IsAppListVisible());
+
+  // Click an app icon in the app grid view.
   app_list::AppsGridView* grid_view =
       ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
           GetRootGridView();
   ASSERT_TRUE(grid_view);
   const views::ViewModelT<app_list::AppListItemView>* vm_grid =
       grid_view->view_model_for_test();
   EXPECT_EQ(2, vm_grid->view_size());
   gfx::Rect bounds_grid_1 = vm_grid->view_at(1)->GetBoundsInScreen();
   // Test now that a click does create a new application tab.
   TabStripModel* tab_strip = browser()->tab_strip_model();
@@ skipping 161 matching lines @@
       chrome::GetSettingsUrl(std::string()));
   Browser* settings_browser =
       settings_manager->FindBrowserForProfile(browser()->profile());
   ASSERT_TRUE(settings_browser);
   EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false));
   EXPECT_EQ(item_count + 1, shelf_model->item_count());
 
   // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded.
   // crbug.com/230464.
 }