Reland "Send FrameSwapMessageQueue's messages in QueueMessageSwapPromise" with fixes

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 <utility>
 
 #include "base/memory/ptr_util.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),
-        queue_(new FrameSwapMessageQueue()) {}
+        queue_(new FrameSwapMessageQueue(0)) {}
 
  protected:
   void QueueNextSwapMessage(std::unique_ptr<IPC::Message> msg) {
     queue_->QueueMessageForFrame(MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP, 0,
                                  std::move(msg), NULL);
   }
 
   void QueueNextSwapMessage(std::unique_ptr<IPC::Message> msg, bool* first) {
     queue_->QueueMessageForFrame(MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP, 0,
                                  std::move(msg), first);
@@ skipping 267 matching lines @@
   std::vector<std::unique_ptr<IPC::Message>> messages;
   queue_->DidNotSwap(frame, cc::SwapPromise::SWAP_FAILS, &messages);
   CHECK_EQ(1UL, messages.size());
   EXPECT_EQ(messages[0].get(), msgSent);
   msgSent = nullptr;
 
   queue_ = nullptr;
 }
 
 }  // namespace content