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

content/shell/renderer/test_runner/event_sender.cc

Index: content/shell/renderer/test_runner/event_sender.cc
diff --git a/content/shell/renderer/test_runner/event_sender.cc b/content/shell/renderer/test_runner/event_sender.cc
index 8971ab62f5908ae5304c369c4a876825680eedd6..b22fe7291c6bcc4be1a8a99aaeffa86cc188e650 100644
--- a/content/shell/renderer/test_runner/event_sender.cc
+++ b/content/shell/renderer/test_runner/event_sender.cc
@@ -2207,21 +2207,14 @@
   bool paged = false;
   bool has_precise_scrolling_deltas = false;
   int modifiers = 0;
-  bool can_scroll = true;
-  if (args->PeekNext().IsEmpty())
-    return;
-  args->GetNext(&paged);
-  if (args->PeekNext().IsEmpty())
-    return;
-  args->GetNext(&has_precise_scrolling_deltas);
-  if (args->PeekNext().IsEmpty())
-    return;
-  v8::Handle<v8::Value> value;
-  args->GetNext(&value);
-  modifiers = GetKeyModifiersFromV8(value);
-  if (args->PeekNext().IsEmpty())
-    return;
-  args->GetNext(&can_scroll);
+  if (!args->PeekNext().IsEmpty()) {
+    args->GetNext(&paged);
+    if (!args->PeekNext().IsEmpty()) {
+      args->GetNext(&has_precise_scrolling_deltas);
+      if (!args->PeekNext().IsEmpty())
+        modifiers = GetKeyModifiersFromV8(args->PeekNext());
+    }
+  }
 
   InitMouseEvent(WebInputEvent::MouseWheel,
                  pressed_button_,
@@ -2236,7 +2229,7 @@
   event->deltaY = event->wheelTicksY;
   event->scrollByPage = paged;
   event->hasPreciseScrollingDeltas = has_precise_scrolling_deltas;
-  event->canScroll = can_scroll;
+
   if (continuous) {
     event->wheelTicksX /= kScrollbarPixelsPerTick;
     event->wheelTicksY /= kScrollbarPixelsPerTick;