Move VISUAL_STATE promise to activation

content/renderer/gpu/frame_update_message_queue_unittest.cc

Index: content/renderer/gpu/frame_update_message_queue_unittest.cc
diff --git a/content/renderer/gpu/frame_swap_message_queue_unittest.cc b/content/renderer/gpu/frame_update_message_queue_unittest.cc
similarity index 87%
rename from content/renderer/gpu/frame_swap_message_queue_unittest.cc
rename to content/renderer/gpu/frame_update_message_queue_unittest.cc
index dc802c0e33c7748c278b6caf80d5969b2c3273e8..d3d2d1eb60cd9122c4d6135d0bc438996b0699ef 100644
--- a/content/renderer/gpu/frame_swap_message_queue_unittest.cc
+++ b/content/renderer/gpu/frame_update_message_queue_unittest.cc
@@ -2,19 +2,19 @@
 // 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 "content/renderer/gpu/frame_update_message_queue.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
-class FrameSwapMessageQueueTest : public testing::Test {
+class FrameUpdateMessageQueueTest : public testing::Test {
  public:
-  FrameSwapMessageQueueTest()
+  FrameUpdateMessageQueueTest()
       : first_message_(41, 1, IPC::Message::PRIORITY_NORMAL),
         second_message_(42, 2, IPC::Message::PRIORITY_NORMAL),
         third_message_(43, 3, IPC::Message::PRIORITY_NORMAL),
-        queue_(new FrameSwapMessageQueue()) {}
+        queue_(new FrameUpdateMessageQueue()) {}
 
  protected:
   void QueueNextSwapMessage(scoped_ptr<IPC::Message> msg) {
@@ -48,9 +48,9 @@ class FrameSwapMessageQueueTest : public testing::Test {
                      ScopedVector<IPC::Message>* messages) {
     messages->clear();
     queue_->DidSwap(source_frame_number);
-    scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
+    scoped_ptr<FrameUpdateMessageQueue::SendMessageScope> send_message_scope =
         queue_->AcquireSendMessageScope();
-    queue_->DrainMessages(messages);
+    queue_->DrainMessagesForSwap(messages);
   }
 
   bool HasMessageForId(const ScopedVector<IPC::Message>& messages,
@@ -73,17 +73,17 @@ class FrameSwapMessageQueueTest : public testing::Test {
   IPC::Message first_message_;
   IPC::Message second_message_;
   IPC::Message third_message_;
-  scoped_refptr<FrameSwapMessageQueue> queue_;
+  scoped_refptr<FrameUpdateMessageQueue> queue_;
 };
 
-TEST_F(FrameSwapMessageQueueTest, TestEmptyQueueDrain) {
+TEST_F(FrameUpdateMessageQueueTest, TestEmptyQueueDrain) {
   ScopedVector<IPC::Message> messages;
 
   DrainMessages(0, &messages);
   ASSERT_TRUE(messages.empty());
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestEmpty) {
+TEST_F(FrameUpdateMessageQueueTest, TestEmpty) {
   ScopedVector<IPC::Message> messages;
   ASSERT_TRUE(queue_->Empty());
   QueueNextSwapMessage(CloneMessage(first_message_));
@@ -96,7 +96,7 @@ TEST_F(FrameSwapMessageQueueTest, TestEmpty) {
   ASSERT_FALSE(queue_->Empty());
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestQueueMessageFirst) {
+TEST_F(FrameUpdateMessageQueueTest, TestQueueMessageFirst) {
   ScopedVector<IPC::Message> messages;
   bool visual_state_first = false;
   bool next_swap_first = false;
@@ -125,7 +125,7 @@ TEST_F(FrameSwapMessageQueueTest, TestQueueMessageFirst) {
   ASSERT_TRUE(visual_state_first);
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestNextSwapMessageSentWithNextFrame) {
+TEST_F(FrameUpdateMessageQueueTest, TestNextSwapMessageSentWithNextFrame) {
   ScopedVector<IPC::Message> messages;
 
   DrainMessages(1, &messages);
@@ -139,7 +139,7 @@ TEST_F(FrameSwapMessageQueueTest, TestNextSwapMessageSentWithNextFrame) {
   ASSERT_TRUE(messages.empty());
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestNextSwapMessageSentWithCurrentFrame) {
+TEST_F(FrameUpdateMessageQueueTest, TestNextSwapMessageSentWithCurrentFrame) {
   ScopedVector<IPC::Message> messages;
 
   DrainMessages(1, &messages);
@@ -153,7 +153,7 @@ TEST_F(FrameSwapMessageQueueTest, TestNextSwapMessageSentWithCurrentFrame) {
   ASSERT_TRUE(messages.empty());
 }
 
-TEST_F(FrameSwapMessageQueueTest,
+TEST_F(FrameUpdateMessageQueueTest,
        TestDrainsVisualStateMessagesForCorrespondingFrames) {
   ScopedVector<IPC::Message> messages;
 
@@ -177,7 +177,7 @@ TEST_F(FrameSwapMessageQueueTest,
   ASSERT_EQ(third_message_.routing_id(), messages.front()->routing_id());
 }
 
-TEST_F(FrameSwapMessageQueueTest,
+TEST_F(FrameUpdateMessageQueueTest,
        TestQueueNextSwapMessagePreservesFifoOrdering) {
   ScopedVector<IPC::Message> messages;
 
@@ -189,7 +189,7 @@ TEST_F(FrameSwapMessageQueueTest,
   ASSERT_EQ(second_message_.routing_id(), messages[1]->routing_id());
 }
 
-TEST_F(FrameSwapMessageQueueTest,
+TEST_F(FrameUpdateMessageQueueTest,
        TestQueueVisualStateMessagePreservesFifoOrdering) {
   ScopedVector<IPC::Message> messages;
 
@@ -201,7 +201,7 @@ TEST_F(FrameSwapMessageQueueTest,
   ASSERT_EQ(second_message_.routing_id(), messages[1]->routing_id());
 }
 
-void FrameSwapMessageQueueTest::TestDidNotSwap(
+void FrameUpdateMessageQueueTest::TestDidNotSwap(
     cc::SwapPromise::DidNotSwapReason reason) {
   ScopedVector<IPC::Message> messages;
 
@@ -221,15 +221,15 @@ void FrameSwapMessageQueueTest::TestDidNotSwap(
   messages.clear();
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapNoUpdate) {
+TEST_F(FrameUpdateMessageQueueTest, TestDidNotSwapNoUpdate) {
   TestDidNotSwap(cc::SwapPromise::COMMIT_NO_UPDATE);
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapSwapFails) {
+TEST_F(FrameUpdateMessageQueueTest, TestDidNotSwapSwapFails) {
   TestDidNotSwap(cc::SwapPromise::SWAP_FAILS);
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapCommitFails) {
+TEST_F(FrameUpdateMessageQueueTest, TestDidNotSwapCommitFails) {
   ScopedVector<IPC::Message> messages;
 
   QueueNextSwapMessage(CloneMessage(first_message_));
@@ -259,7 +259,7 @@ class NotifiesDeletionMessage : public IPC::Message {
   bool* deleted_;
 };
 
-TEST_F(FrameSwapMessageQueueTest, TestDeletesNextSwapMessage) {
+TEST_F(FrameUpdateMessageQueueTest, TestDeletesNextSwapMessage) {
   bool message_deleted = false;
   QueueNextSwapMessage(make_scoped_ptr(
       new NotifiesDeletionMessage(&message_deleted, first_message_)));
@@ -267,7 +267,7 @@ TEST_F(FrameSwapMessageQueueTest, TestDeletesNextSwapMessage) {
   ASSERT_TRUE(message_deleted);
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestDeletesVisualStateMessage) {
+TEST_F(FrameUpdateMessageQueueTest, TestDeletesVisualStateMessage) {
   bool message_deleted = false;
   QueueVisualStateMessage(1,
                           make_scoped_ptr(new NotifiesDeletionMessage(
@@ -276,7 +276,7 @@ TEST_F(FrameSwapMessageQueueTest, TestDeletesVisualStateMessage) {
   ASSERT_TRUE(message_deleted);
 }
 
-TEST_F(FrameSwapMessageQueueTest, TestDeletesQueuedVisualStateMessage) {
+TEST_F(FrameUpdateMessageQueueTest, TestDeletesQueuedVisualStateMessage) {
   bool message_deleted = false;
   QueueVisualStateMessage(1,
                           make_scoped_ptr(new NotifiesDeletionMessage(