Revert "Converting (Alt+LeftClick -> RightClick) to (Search+LeftClick -> RightClick)"

ash/accelerators/accelerator_filter_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 "ui/wm/core/accelerator_filter.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/accelerators/accelerator_history.h"
 #include "ui/events/event.h"
-#include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 namespace test {
 
 typedef AshTestBase AcceleratorFilterTest;
 
 // Tests if AcceleratorFilter works without a focused window.
 TEST_F(AcceleratorFilterTest, TestFilterWithoutFocus) {
@@ skipping 95 matching lines @@
   // System keys pass through to a child window if the parent (top level)
   // window has the property set.
   scoped_ptr<aura::Window> child(CreateTestWindowInShellWithId(2));
   window->AddChild(child.get());
   dispatch_helper.set_target(child.get());
   filter.OnKeyEvent(&press_volume_up);
   EXPECT_FALSE(press_volume_up.stopped_propagation());
 }
 #endif  // defined(OS_CHROMEOS)
 
-// Tests that pressing 'SEARCH' + LeftMouseClick, which will be rewritten as a
-// RightMouseClick, will not toggle the AppList.
-// This test will fail without the code to clear the current accelerator in
-// the accelerator history present in |AcceleratorFilter::OnMouseEvent()|.
-TEST_F(AcceleratorFilterTest, SearchClickDoesntToggleAppList) {
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-  generator.PressKey(ui::VKEY_LWIN, 0);
-  generator.ClickLeftButton();
-  generator.ReleaseKey(ui::VKEY_LWIN, 0);
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-}
-
-// Make sure that synthesized mouse events don't interfere with tracking
-// the key accelerators.
-TEST_F(AcceleratorFilterTest, SynthesizeMouseEventsAreIgnored) {
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  const gfx::Point origin(0, 0);
-
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-  generator.PressKey(ui::VKEY_LWIN, 0);
-  ui::MouseEvent mouse_event(ui::ET_MOUSE_MOVED, origin, origin,
-                             ui::EventTimeForNow(), ui::EF_IS_SYNTHESIZED, 0);
-  generator.Dispatch(&mouse_event);
-  generator.ReleaseKey(ui::VKEY_LWIN, 0);
-  EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
-}
-
 }  // namespace test
 }  // namespace ash