[WebView] Remove onFailure from VisualStateCallback.

content/renderer/gpu/frame_swap_message_queue_unittest.cc

 // Copyright 2014 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/renderer/gpu/frame_swap_message_queue.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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:
   void QueueNextSwapMessage(scoped_ptr<IPC::Message> msg) {
     queue_->QueueMessageForFrame(
         MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP, 0, msg.Pass(), NULL);
   }
 
   void QueueNextSwapMessage(scoped_ptr<IPC::Message> msg, bool* first) {
     queue_->QueueMessageForFrame(
@@ skipping 19 matching lines @@
 
   void DrainMessages(int source_frame_number,
                      ScopedVector<IPC::Message>* messages) {
     messages->clear();
     queue_->DidSwap(source_frame_number);
     scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
         queue_->AcquireSendMessageScope();
     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();
          i != messages.end();
          ++i) {
       if ((*i)->routing_id() == routing_id)
         return true;
     }
     return false;
   }
@@ skipping 91 matching lines @@
        TestDrainsVisualStateMessagesForCorrespondingFrames) {
   ScopedVector<IPC::Message> messages;
 
   QueueVisualStateMessage(1, CloneMessage(first_message_));
   QueueVisualStateMessage(2, CloneMessage(second_message_));
   QueueVisualStateMessage(3, CloneMessage(third_message_));
   DrainMessages(0, &messages);
   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();
 
   DrainMessages(2, &messages);
   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());
 }
 
 TEST_F(FrameSwapMessageQueueTest,
        TestQueueNextSwapMessagePreservesFifoOrdering) {
   ScopedVector<IPC::Message> messages;
 
   QueueNextSwapMessage(CloneMessage(first_message_));
   QueueNextSwapMessage(CloneMessage(second_message_));
   DrainMessages(1, &messages);
   ASSERT_EQ(2u, messages.size());
   ASSERT_EQ(first_message_.routing_id(), messages[0]->routing_id());
   ASSERT_EQ(second_message_.routing_id(), messages[1]->routing_id());
 }
 
 TEST_F(FrameSwapMessageQueueTest,
        TestQueueVisualStateMessagePreservesFifoOrdering) {
   ScopedVector<IPC::Message> messages;
 
   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());
 }
 
 void FrameSwapMessageQueueTest::TestDidNotSwap(
     cc::SwapPromise::DidNotSwapReason reason) {
   ScopedVector<IPC::Message> messages;
 
   QueueNextSwapMessage(CloneMessage(first_message_));
   QueueVisualStateMessage(2, CloneMessage(second_message_));
   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();
 }
 
 TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapNoUpdate) {
   TestDidNotSwap(cc::SwapPromise::COMMIT_NO_UPDATE);
 }
 
 TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapSwapFails) {
   TestDidNotSwap(cc::SwapPromise::SWAP_FAILS);
 }
 
 TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapCommitFails) {
   ScopedVector<IPC::Message> messages;
 
   QueueNextSwapMessage(CloneMessage(first_message_));
   QueueVisualStateMessage(2, CloneMessage(second_message_));
   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()));
 }
 
 class NotifiesDeletionMessage : public IPC::Message {
  public:
   NotifiesDeletionMessage(bool* deleted, const IPC::Message& other)
       : IPC::Message(other), deleted_(deleted) {}
   ~NotifiesDeletionMessage() override { *deleted_ = true; }
 
  private:
@@ skipping 21 matching lines @@
   bool message_deleted = false;
   QueueVisualStateMessage(1,
                           make_scoped_ptr(new NotifiesDeletionMessage(
                               &message_deleted, first_message_)));
   queue_->DidSwap(1);
   queue_ = NULL;
   ASSERT_TRUE(message_deleted);
 }
 
 }  // namespace content