Revert "cros: Don't dismiss AppList on right click/two finger tap"

This reverts commit 3d3a5267.

Reason for revert: Causes UnhandledEventOnPeeking to fail constantly (see crbug.com/806690).

Original change's description:
> cros: Don't dismiss AppList on right click/two finger tap
> 
> UX request:
> - Don't dismiss AppList if the right click/two finger tap
>   is on the shield of the AppList.
> 
> - Added a test.
> 
> Bug: 805937
> Change-Id: Id38b5872c3836680d08adbcb84922fe62201be19
> Reviewed-on: https://chromium-review.googlesource.com/887282
> Reviewed-by: Jenny Zhang <jennyz@chromium.org>
> Commit-Queue: Alex Newcomer <newcomer@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#532023}

TBR=jennyz@chromium.org,newcomer@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 805937, 806690
Change-Id: I4acd4bbea8a85988224efa7573b719655628e445
Reviewed-on: https://chromium-review.googlesource.com/890264Reviewed-by: vitaliii <vitaliii@chromium.org>
Commit-Queue: vitaliii <vitaliii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532374}

ash/app_list/app_list_presenter_delegate_unittest.cc

@@ -755,43 +755,26 @@ TEST_F(AppListPresenterDelegateTest, WhitespaceQuery) {
   EXPECT_EQ(app_list::AppListViewState::PEEKING, view->app_list_state());
 }
 
-// Tests that an unhandled two finger tap/right click does not close the app
-// list, and an unhandled one finger tap/left click closes the app list in
-// Peeking mode.
+// Tests that an unhandled tap/click in Peeking mode closes the app
+// list.
 TEST_P(AppListPresenterDelegateTest, UnhandledEventOnPeeking) {
   app_list_presenter_impl()->ShowAndRunLoop(GetPrimaryDisplayId());
   app_list::AppListView* view = app_list_presenter_impl()->GetView();
   ASSERT_EQ(app_list::AppListViewState::PEEKING, view->app_list_state());
 
-  // Two finger tap or right click in the empty space below the searchbox. The
-  // app list should not close.
+  // Tap or click in the empty space below the searchbox. The app list should
+  // close.
   gfx::Point empty_space =
       view->search_box_view()->GetBoundsInScreen().bottom_left();
   empty_space.Offset(0, 10);
   ui::test::EventGenerator& generator = GetEventGenerator();
-  if (TestMouseEventParam()) {
-    generator.MoveMouseTo(empty_space);
-    generator.PressRightButton();
-    generator.ReleaseRightButton();
-  } else {
-    ui::TouchEvent two_finger_tap(
-        ui::ET_GESTURE_TWO_FINGER_TAP, empty_space, base::TimeTicks::Now(),
-        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH));
-    generator.Dispatch(&two_finger_tap);
-  }
-
-  EXPECT_EQ(app_list::AppListViewState::PEEKING, view->app_list_state());
-  EXPECT_TRUE(app_list_presenter_impl()->IsVisible());
-
-  // One finger tap or left click in the empty space below the searchbox. The
-  // app list should close.
   if (TestMouseEventParam()) {
     generator.MoveMouseTo(empty_space);
     generator.ClickLeftButton();
+    generator.ReleaseLeftButton();
   } else {
     generator.GestureTapAt(empty_space);
   }
-
   EXPECT_EQ(app_list::AppListViewState::CLOSED, view->app_list_state());
   EXPECT_FALSE(app_list_presenter_impl()->IsVisible());
 }

ui/app_list/views/app_list_view.cc

@@ -521,14 +521,6 @@ void AppListView::HandleClickOrTap(ui::LocatedEvent* event) {
     return;
   }
 
-  // No-op if the event was a right-click or two-finger tap.
-  if ((event->IsGestureEvent() &&
-       event->AsGestureEvent()->type() == ui::ET_GESTURE_TWO_FINGER_TAP) ||
-      (event->IsMouseEvent() &&
-       event->AsMouseEvent()->IsOnlyRightMouseButton())) {
-    return;
-  }
-
   if (!search_box_view_->is_search_box_active()) {
     Dismiss();
     return;