Change the non-blocking event queue to the main thread event queue.

content/public/test/render_view_test.cc

Index: content/public/test/render_view_test.cc
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 8b2d2cf715c689340c613d582ad358f062d0660a..ff945b60261097e5841d19d6a0d22e8f70f274b6 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -440,17 +440,17 @@ void RenderViewTest::SendNativeKeyEvent(
 void RenderViewTest::SendWebKeyboardEvent(
     const blink::WebKeyboardEvent& key_event) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  impl->OnMessageReceived(
-      InputMsg_HandleInputEvent(0, &key_event, ui::LatencyInfo(),
-                                InputEventDispatchType::DISPATCH_TYPE_NORMAL));
+  impl->OnMessageReceived(InputMsg_HandleInputEvent(
+      0, &key_event, ui::LatencyInfo(),
+      InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
 }
 
 void RenderViewTest::SendWebMouseEvent(
     const blink::WebMouseEvent& mouse_event) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  impl->OnMessageReceived(
-      InputMsg_HandleInputEvent(0, &mouse_event, ui::LatencyInfo(),
-                                InputEventDispatchType::DISPATCH_TYPE_NORMAL));
+  impl->OnMessageReceived(InputMsg_HandleInputEvent(
+      0, &mouse_event, ui::LatencyInfo(),
+      InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
 }
 
 const char* const kGetCoordinatesScript =
@@ -516,13 +516,13 @@ void RenderViewTest::SimulatePointClick(const gfx::Point& point) {
   mouse_event.y = point.y();
   mouse_event.clickCount = 1;
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  impl->OnMessageReceived(
-      InputMsg_HandleInputEvent(0, &mouse_event, ui::LatencyInfo(),
-                                InputEventDispatchType::DISPATCH_TYPE_NORMAL));
+  impl->OnMessageReceived(InputMsg_HandleInputEvent(
+      0, &mouse_event, ui::LatencyInfo(),
+      InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
   mouse_event.type = WebInputEvent::MouseUp;
-  impl->OnMessageReceived(
-      InputMsg_HandleInputEvent(0, &mouse_event, ui::LatencyInfo(),
-                                InputEventDispatchType::DISPATCH_TYPE_NORMAL));
+  impl->OnMessageReceived(InputMsg_HandleInputEvent(
+      0, &mouse_event, ui::LatencyInfo(),
+      InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
 }
 
 
@@ -542,13 +542,13 @@ void RenderViewTest::SimulatePointRightClick(const gfx::Point& point) {
   mouse_event.y = point.y();
   mouse_event.clickCount = 1;
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  impl->OnMessageReceived(
-      InputMsg_HandleInputEvent(0, &mouse_event, ui::LatencyInfo(),
-                                InputEventDispatchType::DISPATCH_TYPE_NORMAL));
+  impl->OnMessageReceived(InputMsg_HandleInputEvent(
+      0, &mouse_event, ui::LatencyInfo(),
+      InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
   mouse_event.type = WebInputEvent::MouseUp;
-  impl->OnMessageReceived(
-      InputMsg_HandleInputEvent(0, &mouse_event, ui::LatencyInfo(),
-                                InputEventDispatchType::DISPATCH_TYPE_NORMAL));
+  impl->OnMessageReceived(InputMsg_HandleInputEvent(
+      0, &mouse_event, ui::LatencyInfo(),
+      InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
 }
 
 void RenderViewTest::SimulateRectTap(const gfx::Rect& rect) {
@@ -561,9 +561,9 @@ void RenderViewTest::SimulateRectTap(const gfx::Rect& rect) {
   gesture_event.type = WebInputEvent::GestureTap;
   gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad;
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  impl->OnMessageReceived(
-      InputMsg_HandleInputEvent(0, &gesture_event, ui::LatencyInfo(),
-                                InputEventDispatchType::DISPATCH_TYPE_NORMAL));
+  impl->OnMessageReceived(InputMsg_HandleInputEvent(
+      0, &gesture_event, ui::LatencyInfo(),
+      InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
   impl->FocusChangeComplete();
 }