Move TouchEvent timeout code to the TouchEventQueue

content/browser/renderer_host/input/input_router_impl_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 "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/input/gesture_event_filter.h"
 #include "content/browser/renderer_host/input/input_router_client.h"
 #include "content/browser/renderer_host/input/input_router_impl.h"
 #include "content/browser/renderer_host/input/mock_input_ack_handler.h"
 #include "content/browser/renderer_host/input/mock_input_router_client.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/common/input/web_input_event_traits.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 #if defined(OS_WIN) || defined(USE_AURA)
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/events/event.h"
 #endif
 
@@ skipping 224 matching lines @@
     scoped_ptr<IPC::Message> response(
         new InputHostMsg_HandleInputEvent_ACK(0, type, ack_result,
                                               ui::LatencyInfo()));
     input_router_->OnMessageReceived(*response);
   }
 
   InputRouterImpl* input_router() const {
     return input_router_.get();
   }
 
-  bool no_touch_to_renderer() {
-    return input_router()->touch_event_queue_->no_touch_to_renderer();
-  }
-
   bool TouchEventQueueEmpty() const {
     return input_router()->touch_event_queue_->empty();
   }
 
+  bool TouchEventTimeoutEnabled() const {
+    return input_router()->touch_event_queue_->ack_timeout_enabled();
+  }
+
   size_t GetSentMessageCountAndResetSink() {
     size_t count = process_->sink().message_count();
     process_->sink().ClearMessages();
     return count;
   }
 
   scoped_ptr<MockRenderProcessHost> process_;
   scoped_ptr<MockInputRouterClient> client_;
   scoped_ptr<MockInputAckHandler> ack_handler_;
   scoped_ptr<InputRouterImpl> input_router_;
@@ skipping 562 matching lines @@
 
   SendInputEventACK(WebInputEvent::GestureTap,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
 
   // Now that the Tap has been ACKed, the ShowPress events should receive
   // synthetics acks, and fire immediately.
   EXPECT_EQ(2U, GetSentMessageCountAndResetSink());
   EXPECT_EQ(3U, ack_handler_->GetAndResetAckCount());
 }
 
+// Test that touch ack timeout behavior is properly configured via the command
+// line, and toggled by the view update flags.
+TEST_F(InputRouterImplTest, TouchAckTimeoutConfigured) {
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kTouchAckTimeoutDelayMs, "5");
+  TearDown();
+  SetUp();
+  ASSERT_TRUE(TouchEventTimeoutEnabled());
+
+  // A fixed page scale or mobile viewport should disable the touch timeout.
+  input_router()->OnViewUpdated(InputRouter::FIXED_PAGE_SCALE);
+  EXPECT_FALSE(TouchEventTimeoutEnabled());
+
+  input_router()->OnViewUpdated(InputRouter::VIEW_FLAGS_NONE);
+  EXPECT_TRUE(TouchEventTimeoutEnabled());
+
+  input_router()->OnViewUpdated(InputRouter::MOBILE_VIEWPORT);
+  EXPECT_FALSE(TouchEventTimeoutEnabled());
+
+  input_router()->OnViewUpdated(InputRouter::MOBILE_VIEWPORT |
+                                InputRouter::FIXED_PAGE_SCALE);
+  EXPECT_FALSE(TouchEventTimeoutEnabled());
+
+  input_router()->OnViewUpdated(InputRouter::VIEW_FLAGS_NONE);
+  EXPECT_TRUE(TouchEventTimeoutEnabled());
+}
+
 }  // namespace content