[WebView] Remove onFailure from VisualStateCallback.

content/renderer/gpu/frame_swap_message_queue_unittest.cc

Index: content/renderer/gpu/frame_swap_message_queue_unittest.cc
diff --git a/content/renderer/gpu/frame_swap_message_queue_unittest.cc b/content/renderer/gpu/frame_swap_message_queue_unittest.cc
index 0b0ba8d1469b049b0f7a3a830584fe2f3a10cc6a..10f11e2ba8a924c6750104940b24115482ed2cb6 100644
--- a/content/renderer/gpu/frame_swap_message_queue_unittest.cc
+++ b/content/renderer/gpu/frame_swap_message_queue_unittest.cc
@@ -11,9 +11,9 @@ namespace content {
 class FrameSwapMessageQueueTest : public testing::Test {
  public:
   FrameSwapMessageQueueTest()
-      : first_message_(41, 1, IPC::Message::PRIORITY_NORMAL),
-        second_message_(42, 2, IPC::Message::PRIORITY_NORMAL),
-        third_message_(43, 3, IPC::Message::PRIORITY_NORMAL),
+      : first_message_(41,  0xdecaf001, IPC::Message::PRIORITY_NORMAL),
+        second_message_(42, 0xdecaf002, IPC::Message::PRIORITY_NORMAL),
+        third_message_(43,  0xdecaf003, IPC::Message::PRIORITY_NORMAL),
         queue_(new FrameSwapMessageQueue()) {}
 
  protected:
@@ -53,6 +53,13 @@ class FrameSwapMessageQueueTest : public testing::Test {
     queue_->DrainMessages(messages);
   }
 
+  int ExpectedMessageCount(const ScopedVector<IPC::Message>& messages) {
+    return std::count_if(messages.begin(), messages.end(),
+                         [](IPC::Message* msg) -> bool {
+                           return (msg->type() & 0xfffff000) == 0xdecaf000;
+                         });
+  }
+
   bool HasMessageForId(const ScopedVector<IPC::Message>& messages,
                        int routing_id) {
     for (ScopedVector<IPC::Message>::const_iterator i = messages.begin();
@@ -164,7 +171,7 @@ TEST_F(FrameSwapMessageQueueTest,
   ASSERT_TRUE(messages.empty());
 
   DrainMessages(2, &messages);
-  ASSERT_EQ(2u, messages.size());
+  ASSERT_EQ(2, ExpectedMessageCount(messages));
   ASSERT_TRUE(HasMessageForId(messages, first_message_.routing_id()));
   ASSERT_TRUE(HasMessageForId(messages, second_message_.routing_id()));
   messages.clear();
@@ -173,7 +180,7 @@ TEST_F(FrameSwapMessageQueueTest,
   ASSERT_TRUE(messages.empty());
 
   DrainMessages(5, &messages);
-  ASSERT_EQ(1u, messages.size());
+  ASSERT_EQ(1, ExpectedMessageCount(messages));
   ASSERT_EQ(third_message_.routing_id(), messages.front()->routing_id());
 }
 
@@ -196,7 +203,7 @@ TEST_F(FrameSwapMessageQueueTest,
   QueueVisualStateMessage(1, CloneMessage(first_message_));
   QueueVisualStateMessage(1, CloneMessage(second_message_));
   DrainMessages(1, &messages);
-  ASSERT_EQ(2u, messages.size());
+  ASSERT_EQ(2, ExpectedMessageCount(messages));
   ASSERT_EQ(first_message_.routing_id(), messages[0]->routing_id());
   ASSERT_EQ(second_message_.routing_id(), messages[1]->routing_id());
 }
@@ -210,13 +217,13 @@ void FrameSwapMessageQueueTest::TestDidNotSwap(
   QueueVisualStateMessage(3, CloneMessage(third_message_));
 
   queue_->DidNotSwap(2, cc::SwapPromise::COMMIT_NO_UPDATE, &messages);
-  ASSERT_EQ(2u, messages.size());
+  ASSERT_EQ(2, ExpectedMessageCount(messages));
   ASSERT_TRUE(HasMessageForId(messages, first_message_.routing_id()));
   ASSERT_TRUE(HasMessageForId(messages, second_message_.routing_id()));
   messages.clear();
 
   queue_->DidNotSwap(3, cc::SwapPromise::COMMIT_NO_UPDATE, &messages);
-  ASSERT_EQ(1u, messages.size());
+  ASSERT_EQ(1, ExpectedMessageCount(messages));
   ASSERT_TRUE(HasMessageForId(messages, third_message_.routing_id()));
   messages.clear();
 }
@@ -237,17 +244,17 @@ TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapCommitFails) {
   QueueVisualStateMessage(3, CloneMessage(third_message_));
 
   queue_->DidNotSwap(2, cc::SwapPromise::COMMIT_FAILS, &messages);
-  ASSERT_EQ(1u, messages.size());
+  ASSERT_EQ(1, ExpectedMessageCount(messages));
   ASSERT_TRUE(HasMessageForId(messages, second_message_.routing_id()));
   messages.clear();
 
   queue_->DidNotSwap(3, cc::SwapPromise::COMMIT_FAILS, &messages);
-  ASSERT_EQ(1u, messages.size());
+  ASSERT_EQ(1, ExpectedMessageCount(messages));
   ASSERT_TRUE(HasMessageForId(messages, third_message_.routing_id()));
   messages.clear();
 
   DrainMessages(1, &messages);
-  ASSERT_EQ(1u, messages.size());
+  ASSERT_EQ(1, ExpectedMessageCount(messages));
   ASSERT_TRUE(HasMessageForId(messages, first_message_.routing_id()));
 }