Move VISUAL_STATE promise to activation

content/renderer/gpu/queue_message_swap_promise_unittest.cc

Index: content/renderer/gpu/queue_message_swap_promise_unittest.cc
diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
index 069cd2cdde9f231f80b80240cdf521ff6af7a406..5c67b6c0e819fecd1b3b3c3070c24dd5afce6395 100644
--- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc
+++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "base/memory/scoped_vector.h"
 #include "cc/output/swap_promise.h"
-#include "content/renderer/gpu/frame_swap_message_queue.h"
+#include "content/renderer/gpu/frame_update_message_queue.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/render_widget.h"
 #include "content/test/mock_render_process.h"
@@ -56,7 +56,7 @@ struct QueueMessageData {
 class QueueMessageSwapPromiseTest : public testing::Test {
  public:
   QueueMessageSwapPromiseTest()
-      : frame_swap_message_queue_(new FrameSwapMessageQueue()),
+      : frame_update_message_queue_(new FrameUpdateMessageQueue()),
         sync_message_filter_(new TestSyncMessageFilter()) {}
 
   ~QueueMessageSwapPromiseTest() override {}
@@ -66,7 +66,7 @@ class QueueMessageSwapPromiseTest : public testing::Test {
                                                int source_frame_number) {
     return TestRenderWidget::QueueMessageImpl(msg,
                                               policy,
-                                              frame_swap_message_queue_.get(),
+                                              frame_update_message_queue_.get(),
                                               sync_message_filter_,
                                               source_frame_number).Pass();
   }
@@ -77,9 +77,9 @@ class QueueMessageSwapPromiseTest : public testing::Test {
 
   ScopedVector<IPC::Message>& NextSwapMessages() {
     next_swap_messages_.clear();
-    scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
-        frame_swap_message_queue_->AcquireSendMessageScope();
-    frame_swap_message_queue_->DrainMessages(&next_swap_messages_);
+    scoped_ptr<FrameUpdateMessageQueue::SendMessageScope> send_message_scope =
+        frame_update_message_queue_->AcquireSendMessageScope();
+    frame_update_message_queue_->DrainMessagesForSwap(&next_swap_messages_);
     return next_swap_messages_;
   }
 
@@ -124,7 +124,7 @@ class QueueMessageSwapPromiseTest : public testing::Test {
   void VisualStateSwapPromiseDidNotSwap(
       cc::SwapPromise::DidNotSwapReason reason);
 
-  scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
+  scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue_;
   scoped_refptr<TestSyncMessageFilter> sync_message_filter_;
   std::vector<IPC::Message> messages_;
   ScopedVector<cc::SwapPromise> promises_;
@@ -144,7 +144,7 @@ TEST_F(QueueMessageSwapPromiseTest, NextSwapPolicySchedulesMessageForNextSwap) {
 
   ASSERT_TRUE(promises_[0]);
   EXPECT_TRUE(DirectSendMessages().empty());
-  EXPECT_FALSE(frame_swap_message_queue_->Empty());
+  EXPECT_FALSE(frame_update_message_queue_->Empty());
   EXPECT_TRUE(NextSwapHasMessage(messages_[0]));
 
   CleanupPromises();
@@ -174,7 +174,7 @@ TEST_F(QueueMessageSwapPromiseTest, NextSwapPolicySendsMessageOnNoUpdate) {
   promises_[0]->DidNotSwap(cc::SwapPromise::COMMIT_NO_UPDATE);
   EXPECT_TRUE(ContainsMessage(DirectSendMessages(), messages_[0]));
   EXPECT_TRUE(NextSwapMessages().empty());
-  EXPECT_TRUE(frame_swap_message_queue_->Empty());
+  EXPECT_TRUE(frame_update_message_queue_->Empty());
 }
 
 TEST_F(QueueMessageSwapPromiseTest, NextSwapPolicySendsMessageOnSwapFails) {
@@ -187,7 +187,7 @@ TEST_F(QueueMessageSwapPromiseTest, NextSwapPolicySendsMessageOnSwapFails) {
   promises_[0]->DidNotSwap(cc::SwapPromise::SWAP_FAILS);
   EXPECT_TRUE(ContainsMessage(DirectSendMessages(), messages_[0]));
   EXPECT_TRUE(NextSwapMessages().empty());
-  EXPECT_TRUE(frame_swap_message_queue_->Empty());
+  EXPECT_TRUE(frame_update_message_queue_->Empty());
 }
 
 TEST_F(QueueMessageSwapPromiseTest, NextSwapPolicyRetainsMessageOnCommitFails) {
@@ -199,7 +199,7 @@ TEST_F(QueueMessageSwapPromiseTest, NextSwapPolicyRetainsMessageOnCommitFails) {
 
   promises_[0]->DidNotSwap(cc::SwapPromise::COMMIT_FAILS);
   EXPECT_TRUE(DirectSendMessages().empty());
-  EXPECT_FALSE(frame_swap_message_queue_->Empty());
+  EXPECT_FALSE(frame_update_message_queue_->Empty());
   EXPECT_TRUE(NextSwapHasMessage(messages_[0]));
 }
 
@@ -213,7 +213,7 @@ TEST_F(QueueMessageSwapPromiseTest,
 
   ASSERT_TRUE(promises_[0]);
   EXPECT_TRUE(DirectSendMessages().empty());
-  EXPECT_FALSE(frame_swap_message_queue_->Empty());
+  EXPECT_FALSE(frame_update_message_queue_->Empty());
   EXPECT_TRUE(NextSwapMessages().empty());
 
   CleanupPromises();
@@ -229,7 +229,7 @@ TEST_F(QueueMessageSwapPromiseTest,
   QueueMessages(data, arraysize(data));
 
   EXPECT_TRUE(DirectSendMessages().empty());
-  EXPECT_FALSE(frame_swap_message_queue_->Empty());
+  EXPECT_FALSE(frame_update_message_queue_->Empty());
   EXPECT_FALSE(NextSwapHasMessage(messages_[1]));
 
   CleanupPromises();
@@ -260,7 +260,7 @@ TEST_F(QueueMessageSwapPromiseTest, VisualStateSwapPromiseDidSwap) {
 
   EXPECT_TRUE(DirectSendMessages().empty());
   EXPECT_TRUE(NextSwapMessages().empty());
-  EXPECT_TRUE(frame_swap_message_queue_->Empty());
+  EXPECT_TRUE(frame_update_message_queue_->Empty());
 }
 
 void QueueMessageSwapPromiseTest::VisualStateSwapPromiseDidNotSwap(
@@ -286,7 +286,7 @@ void QueueMessageSwapPromiseTest::VisualStateSwapPromiseDidNotSwap(
   EXPECT_TRUE(ContainsMessage(DirectSendMessages(), messages_[2]));
 
   EXPECT_TRUE(NextSwapMessages().empty());
-  EXPECT_TRUE(frame_swap_message_queue_->Empty());
+  EXPECT_TRUE(frame_update_message_queue_->Empty());
 }
 
 TEST_F(QueueMessageSwapPromiseTest, VisalStateSwapPromiseDidNotSwapNoUpdate) {
@@ -321,7 +321,7 @@ TEST_F(QueueMessageSwapPromiseTest,
   EXPECT_FALSE(ContainsMessage(DirectSendMessages(), messages_[2]));
 
   EXPECT_TRUE(NextSwapMessages().empty());
-  EXPECT_FALSE(frame_swap_message_queue_->Empty());
+  EXPECT_FALSE(frame_update_message_queue_->Empty());
 }
 
 TEST_F(QueueMessageSwapPromiseTest, VisalStateSwapPromiseDidNotSwapSwapFails) {