Splitting DidSwap in cc::SwapPromise into WillSwap and DidSwap

cc/trees/swap_promise_manager_unittest.cc

 // Copyright 2016 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 "cc/trees/swap_promise_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/trees/swap_promise_monitor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 13 matching lines @@
   void OnSetNeedsRedrawOnImpl() override {}
   void OnForwardScrollUpdateToMainThreadOnImpl() override {}
 };
 
 class MockSwapPromise : public SwapPromise {
  public:
   MockSwapPromise() {}
   ~MockSwapPromise() override {}
 
   void DidActivate() override {}
-  void DidSwap(CompositorFrameMetadata* metadata) override {}
+  void WillSwap(CompositorFrameMetadata* metadata) override {}
+  void DidSwap() override {}
   DidNotSwapAction DidNotSwap(DidNotSwapReason reason) override {
     return DidNotSwapAction::BREAK_PROMISE;
   }
   MOCK_METHOD0(OnCommit, void());
   int64_t TraceId() const override { return 0; }
 };
 
 TEST(SwapPromiseManagerTest, SwapPromiseMonitors) {
   SwapPromiseManager manager;
   StrictMock<MockSwapPromiseMonitor> monitor(&manager);
@@ skipping 18 matching lines @@
   std::vector<std::unique_ptr<SwapPromise>> swap_promise_list =
       manager.TakeSwapPromises();
   // Now that we've taken the promises, this shouldn't trigger a call.
   manager.WillCommit();
 
   EXPECT_EQ(1, static_cast<int>(swap_promise_list.size()));
 }
 
 }  // namespace
 }  // namespace cc