Revert of Explicitly suppress scrolling for wheel events that will trigger zooming

content/browser/renderer_host/render_widget_host_view_aura_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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 290 matching lines @@
  private:
   aura::Window* owner_;
   DISALLOW_COPY_AND_ASSIGN(FullscreenLayoutManager);
 };
 
 class MockWindowObserver : public aura::WindowObserver {
  public:
   MOCK_METHOD2(OnDelegatedFrameDamage, void(aura::Window*, const gfx::Rect&));
 };
 
-const WebInputEvent* GetInputEventFromMessage(const IPC::Message& message) {
-  PickleIterator iter(message);
-  const char* data;
-  int data_length;
-  if (!iter.ReadData(&data, &data_length))
-    return NULL;
-  return reinterpret_cast<const WebInputEvent*>(data);
-}
-
 }  // namespace
 
 class RenderWidgetHostViewAuraTest : public testing::Test {
  public:
   RenderWidgetHostViewAuraTest()
       : widget_host_uses_shutdown_to_destroy_(false),
         is_guest_view_hack_(false),
         browser_thread_for_ui_(BrowserThread::UI, &message_loop_) {}
 
   void SetUpEnvironment() {
@@ skipping 60 matching lines @@
     // Here should be base::MemoryPressureListener::NotifyMemoryPressure, but
     // since the RendererFrameManager is installing a MemoryPressureListener
     // which uses ObserverListThreadSafe, which furthermore remembers the
     // message loop for the thread it was created in. Between tests, the
     // RendererFrameManager singleton survives and and the MessageLoop gets
     // destroyed. The correct fix would be to have ObserverListThreadSafe look
     // up the proper message loop every time (see crbug.com/443824.)
     RendererFrameManager::GetInstance()->OnMemoryPressure(level);
   }
 
-  void SendInputEventACK(WebInputEvent::Type type,
-      InputEventAckState ack_result) {
-    InputHostMsg_HandleInputEvent_ACK_Params ack;
-    ack.type = type;
-    ack.state = ack_result;
-    InputHostMsg_HandleInputEvent_ACK response(0, ack);
-    widget_host_->OnMessageReceived(response);
-  }
-
  protected:
   // If true, then calls RWH::Shutdown() instead of deleting RWH.
   bool widget_host_uses_shutdown_to_destroy_;
 
   bool is_guest_view_hack_;
 
   base::MessageLoopForUI message_loop_;
   BrowserThreadImpl browser_thread_for_ui_;
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
   scoped_ptr<BrowserContext> browser_context_;
@@ skipping 172 matching lines @@
   }
 
   // Inject synthetic GestureFlingStart events.
   void SimulateGestureFlingStartEvent(float velocityX,
                                       float velocityY,
                                       blink::WebGestureDevice sourceDevice) {
     SimulateGestureEventCore(SyntheticWebGestureEventBuilder::BuildFling(
         velocityX, velocityY, sourceDevice));
   }
 
+  void SendInputEventACK(WebInputEvent::Type type,
+                         InputEventAckState ack_result) {
+    InputHostMsg_HandleInputEvent_ACK_Params ack;
+    ack.type = type;
+    ack.state = ack_result;
+    InputHostMsg_HandleInputEvent_ACK response(0, ack);
+    widget_host_->OnMessageReceived(response);
+  }
+
   bool ScrollStateIsContentScrolling() const {
     return scroll_state() == OverscrollController::STATE_CONTENT_SCROLLING;
   }
 
   bool ScrollStateIsOverscrolling() const {
     return scroll_state() == OverscrollController::STATE_OVERSCROLLING;
   }
 
   bool ScrollStateIsUnknown() const {
     return scroll_state() == OverscrollController::STATE_UNKNOWN;
@@ skipping 2462 matching lines @@
 
   const NativeWebKeyboardEvent* event = delegate_.last_event();
   EXPECT_NE(nullptr, event);
   if (event) {
     EXPECT_EQ(key_event.key_code(), event->windowsKeyCode);
     EXPECT_EQ(ui::KeycodeConverter::DomCodeToNativeKeycode(key_event.code()),
               event->nativeKeyCode);
   }
 }
 
-TEST_F(RenderWidgetHostViewAuraTest, SetCanScrollForWebMouseWheelEvent) {
-  view_->InitAsChild(NULL);
-  view_->Show();
-
-  sink_->ClearMessages();
-
-  // Simulates the mouse wheel event with ctrl modifier applied.
-  ui::MouseWheelEvent event(gfx::Vector2d(1, 1),
-                             gfx::Point(), gfx::Point(),
-                             ui::EF_CONTROL_DOWN, 0);
-  view_->OnMouseEvent(&event);
-
-  const WebInputEvent* input_event =
-      GetInputEventFromMessage(*sink_->GetMessageAt(0));
-  const WebMouseWheelEvent* wheel_event =
-      static_cast<const WebMouseWheelEvent*>(input_event);
-  // Check if the canScroll set to false when ctrl-scroll is generated from
-  // mouse wheel event.
-  EXPECT_FALSE(wheel_event->canScroll);
-  sink_->ClearMessages();
-
-  // Ack'ing the outstanding event should flush the pending event queue.
-  SendInputEventACK(blink::WebInputEvent::MouseWheel,
-      INPUT_EVENT_ACK_STATE_CONSUMED);
-
-  // Simulates the mouse wheel event with no modifier applied.
-  event = ui::MouseWheelEvent(gfx::Vector2d(1, 1), gfx::Point(), gfx::Point(),
-      ui::EF_NONE, 0);
-
-  view_->OnMouseEvent(&event);
-
-  input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0));
-  wheel_event = static_cast<const WebMouseWheelEvent*>(input_event);
-  // Check if the canScroll set to true when no modifier is applied to the
-  // mouse wheel event.
-  EXPECT_TRUE(wheel_event->canScroll);
-  sink_->ClearMessages();
-
-  SendInputEventACK(blink::WebInputEvent::MouseWheel,
-      INPUT_EVENT_ACK_STATE_CONSUMED);
-
-  // Simulates the scroll event with ctrl modifier applied.
-  ui::ScrollEvent scroll(ui::ET_SCROLL, gfx::Point(2, 2), ui::EventTimeForNow(),
-      ui::EF_CONTROL_DOWN, 0, 5, 0, 5, 2);
-  view_->OnScrollEvent(&scroll);
-
-  input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0));
-  wheel_event = static_cast<const WebMouseWheelEvent*>(input_event);
-  // Check if the canScroll set to true when ctrl-touchpad-scroll is generated
-  // from scroll event.
-  EXPECT_TRUE(wheel_event->canScroll);
-}
-
 }  // namespace content