MacViews: Fix app_list_unittests for mouseover change in r311143

ui/app_list/views/app_list_main_view_unittest.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 "ui/app_list/views/app_list_main_view.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
@@ skipping 255 matching lines @@
   delegate_->ReplaceTestModel(kReplacementItems);
   main_view_->ModelChanged();
   EXPECT_EQ(kReplacementItems, RootViewModel()->view_size());
 }
 
 // Tests that mouse hovering over an app item highlights it
 TEST_F(AppListMainViewTest, MouseHoverToHighlight) {
   delegate_->GetTestModel()->PopulateApps(2);
   main_widget_->Show();
 
-  ui::test::EventGenerator generator(
-      main_widget_->GetNativeWindow()->GetRootWindow());
+  ui::test::EventGenerator generator(GetContext(),
+                                     main_widget_->GetNativeWindow());
   AppListItemView* item0 = RootViewModel()->view_at(0);
   AppListItemView* item1 = RootViewModel()->view_at(1);
 
   // If experimental launcher, switch to All Apps page
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     GetContentsView()->SetActivePage(
         GetContentsView()->GetPageIndexForState(AppListModel::STATE_APPS));
     GetContentsView()->Layout();
   }
 
   generator.MoveMouseTo(item0->GetBoundsInScreen().CenterPoint());
   EXPECT_TRUE(item0->is_highlighted());
   EXPECT_FALSE(item1->is_highlighted());
 
   generator.MoveMouseTo(item1->GetBoundsInScreen().CenterPoint());
   EXPECT_FALSE(item0->is_highlighted());
   EXPECT_TRUE(item1->is_highlighted());
 
   generator.MoveMouseTo(gfx::Point(-1, -1));
   EXPECT_FALSE(item0->is_highlighted());
   EXPECT_FALSE(item1->is_highlighted());
 }
 
+// No touch on desktop Mac. Tracked in http://crbug.com/445520.
+#if defined(OS_MACOSX) && !defined(USE_AURA)
+#define MAYBE_TapGestureToHighlight DISABLED_TapGestureToHighlight
+#else
+#define MAYBE_TapGestureToHighlight TapGestureToHighlight
+#endif
+
 // Tests that tap gesture on app item highlights it
-TEST_F(AppListMainViewTest, TapGestureToHighlight) {
+TEST_F(AppListMainViewTest, MAYBE_TapGestureToHighlight) {
   delegate_->GetTestModel()->PopulateApps(1);
   main_widget_->Show();
 
-  ui::test::EventGenerator generator(
-      main_widget_->GetNativeWindow()->GetRootWindow());
+  ui::test::EventGenerator generator(GetContext(),
+                                     main_widget_->GetNativeWindow());
   AppListItemView* item = RootViewModel()->view_at(0);
 
   // If experimental launcher, switch to All Apps page
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     GetContentsView()->SetActivePage(
         GetContentsView()->GetPageIndexForState(AppListModel::STATE_APPS));
     GetContentsView()->Layout();
   }
 
   generator.set_current_location(item->GetBoundsInScreen().CenterPoint());
@@ skipping 126 matching lines @@
   // The app list model should remain unchanged.
   EXPECT_EQ(1, FolderViewModel()->view_size());
   EXPECT_EQ(2, RootViewModel()->view_size());
   EXPECT_EQ(folder_id, RootGridView()->GetItemViewAt(0)->item()->id());
   EXPECT_NE(nullptr,
             delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
 }
 
 }  // namespace test
 }  // namespace app_list