Don't restart the hang renderer timeout on messages ack'd from the compositor thread.

content/public/test/browser_test_utils.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/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <tuple>
 #include <utility>
 
@@ skipping 1461 matching lines @@
         BrowserThread::UI, FROM_HERE,
         base::Bind(&MainThreadFrameObserver::Quit, base::Unretained(this)));
   }
   return true;
 }
 
 InputMsgWatcher::InputMsgWatcher(RenderWidgetHost* render_widget_host,
                                  blink::WebInputEvent::Type type)
     : BrowserMessageFilter(InputMsgStart),
       wait_for_type_(type),
-      ack_result_(INPUT_EVENT_ACK_STATE_UNKNOWN) {
+      ack_result_(INPUT_EVENT_ACK_STATE_UNKNOWN),
+      ack_source_(static_cast<uint32_t>(InputEventAckSource::UNKNOWN)) {
   render_widget_host->GetProcess()->AddFilter(this);
 }
 
 InputMsgWatcher::~InputMsgWatcher() {}
 
 void InputMsgWatcher::ReceivedAck(blink::WebInputEvent::Type ack_type,
-                                  uint32_t ack_state) {
+                                  uint32_t ack_state,
+                                  uint32_t ack_source) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (wait_for_type_ == ack_type) {
     ack_result_ = ack_state;
+    ack_source_ = ack_source;
     if (!quit_.is_null())
       quit_.Run();
   }
 }
 
 bool InputMsgWatcher::OnMessageReceived(const IPC::Message& message) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) {
     InputHostMsg_HandleInputEvent_ACK::Param params;
     InputHostMsg_HandleInputEvent_ACK::Read(&message, &params);
     blink::WebInputEvent::Type ack_type = std::get<0>(params).type;
     InputEventAckState ack_state = std::get<0>(params).state;
+    InputEventAckSource ack_source = std::get<0>(params).source;
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(&InputMsgWatcher::ReceivedAck, this, ack_type, ack_state));
+        base::Bind(&InputMsgWatcher::ReceivedAck, this, ack_type, ack_state,
+                   static_cast<uint32_t>(ack_source)));
   }
   return false;
 }
 
 uint32_t InputMsgWatcher::WaitForAck() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (ack_result_ != INPUT_EVENT_ACK_STATE_UNKNOWN)
     return ack_result_;
   base::RunLoop run_loop;
   base::AutoReset<base::Closure> reset_quit(&quit_, run_loop.QuitClosure());
@@ skipping 239 matching lines @@
 
   std::string ascii_message = base::UTF16ToASCII(message);
   if (base::MatchPattern(ascii_message, filter_)) {
     message_ = ascii_message;
     message_loop_runner_->Quit();
   }
   return false;
 }
 
 }  // namespace content