Splitting DidSwap in cc::SwapPromise into WillSwap and DidSwap

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 cc8777b6adbc3427f11989a43ae2a4701182f07b..3f6d7561fa010f441716eb46635439de10103e1d 100644
--- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc
+++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
@@ -120,7 +120,8 @@ class QueueMessageSwapPromiseTest : public testing::Test {
          ++i) {
       if (*i) {
         (*i)->DidActivate();
-        (*i)->DidSwap(NULL);
+        (*i)->WillSwap(NULL);
+        (*i)->DidSwap();
       }
     }
   }
@@ -150,11 +151,12 @@ TEST_F(QueueMessageSwapPromiseTest, NextSwapPolicySchedulesMessageForNextSwap) {
 
   ASSERT_TRUE(promises_[0]);
   promises_[0]->DidActivate();
-  promises_[0]->DidSwap(NULL);
+  promises_[0]->WillSwap(NULL);
+  promises_[0]->DidSwap();
 
   EXPECT_TRUE(DirectSendMessages().empty());
   EXPECT_FALSE(frame_swap_message_queue_->Empty());
-  // frame_swap_message_queue_->DidSwap(1);
+  // frame_swap_message_queue_->WillSwap(1);
   EXPECT_TRUE(NextSwapHasMessage(messages_[0]));
 }
 
@@ -254,7 +256,8 @@ TEST_F(QueueMessageSwapPromiseTest, VisualStateSwapPromiseDidActivate) {
   QueueMessages(data, arraysize(data));
 
   promises_[0]->DidActivate();
-  promises_[0]->DidSwap(NULL);
+  promises_[0]->WillSwap(NULL);
+  promises_[0]->DidSwap();
   ASSERT_FALSE(promises_[1]);
   std::vector<std::unique_ptr<IPC::Message>> messages;
   messages.swap(NextSwapMessages());