Make RenderWidgetHostViewAuraTest.Resize robust to different IPC orderings

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 1513 matching lines @@
     // Frame isn't desired size, so early ack.
     EXPECT_EQ(1u, sink_->message_count());
   }
   EXPECT_EQ(size2.ToString(), view_->GetRequestedRendererSize().ToString());
 
   // Wait for commit, then we should unlock the compositor and send a Resize
   // message (and a frame ack)
   ui::DrawWaiterForTest::WaitForCommit(
       root_window->GetHost()->compositor());
 
-  // On some platforms, the call to view_->Show() causes a posted task to call
-  // ui::WindowEventDispatcher::SynthesizeMouseMoveAfterChangeToWindow, which
-  // the above WaitForCommit may cause to be picked up. Be robust to this extra
-  // IPC coming in.
-  bool has_extra_ipc = (sink_->message_count() == 3);
-  if (has_extra_ipc) {
-    const IPC::Message* msg = sink_->GetMessageAt(0);
-    EXPECT_EQ(InputMsg_HandleInputEvent::ID, msg->type());
-    InputMsg_HandleInputEvent::Param params;
-    InputMsg_HandleInputEvent::Read(msg, &params);
-    const blink::WebInputEvent* event = get<0>(params);
-    EXPECT_EQ(blink::WebInputEvent::MouseMove, event->type);
+  bool has_resize = false;
+  for (uint32 i = 0; i < sink_->message_count(); ++i) {
+    const IPC::Message* msg = sink_->GetMessageAt(i);
+    switch (msg->type()) {
+      case InputMsg_HandleInputEvent::ID: {
+        // On some platforms, the call to view_->Show() causes a posted task to
+        // call
+        // ui::WindowEventDispatcher::SynthesizeMouseMoveAfterChangeToWindow,
+        // which the above WaitForCommit may cause to be picked up. Be robust
+        // to this extra IPC coming in.
+        InputMsg_HandleInputEvent::Param params;
+        InputMsg_HandleInputEvent::Read(msg, &params);
+        const blink::WebInputEvent* event = get<0>(params);
+        EXPECT_EQ(blink::WebInputEvent::MouseMove, event->type);
+        break;
+      }
+      case ViewMsg_SwapCompositorFrameAck::ID:
+        break;
+      case ViewMsg_Resize::ID: {
+        EXPECT_FALSE(has_resize);
+        ViewMsg_Resize::Param params;
+        ViewMsg_Resize::Read(msg, &params);
+        EXPECT_EQ(size3.ToString(), get<0>(params).new_size.ToString());
+        has_resize = true;
+        break;
+      }
+      default:
+        EXPECT_TRUE(false);

[piman, 2015/01/30 03:57:54]

nit: ADD_FAILURE()
You can even add a message.

+        break;
+    }
   }
-  else {
-    EXPECT_EQ(2u, sink_->message_count());
-  }
-  EXPECT_EQ(ViewMsg_SwapCompositorFrameAck::ID,
-            sink_->GetMessageAt(has_extra_ipc ? 1 : 0)->type());
-  {
-    const IPC::Message* msg = sink_->GetMessageAt(has_extra_ipc ? 2 : 1);
-    EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
-    ViewMsg_Resize::Param params;
-    ViewMsg_Resize::Read(msg, &params);
-    EXPECT_EQ(size3.ToString(), get<0>(params).new_size.ToString());
-  }
+  EXPECT_TRUE(has_resize);
   update_params.view_size = size3;
   widget_host_->OnMessageReceived(
       ViewHostMsg_UpdateRect(widget_host_->GetRoutingID(), update_params));
   sink_->ClearMessages();
 }
 
 // Skipped frames should not drop their damage.
 TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {
   gfx::Rect view_rect(100, 100);
   gfx::Size frame_size = view_rect.size();
@@ skipping 1583 matching lines @@
   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