Make RenderViewImpl::OnForceRedraw more robust

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 45c435a0a6277611382918892238a3c8deb91bdb..1e535c6e8855f5eaa437a688c11c869bbc3ab1f3 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4491,7 +4491,7 @@ class TestSwapPromise : public SwapPromise {
     result_->did_swap_called = true;
   }
 
-  void DidNotSwap(DidNotSwapReason reason) override {
+  DidNotSwapAction DidNotSwap(DidNotSwapReason reason) override {
     base::AutoLock lock(result_->lock);
     EXPECT_FALSE(result_->did_swap_called);
     EXPECT_FALSE(result_->did_not_swap_called);
@@ -4499,6 +4499,7 @@ class TestSwapPromise : public SwapPromise {
                  reason != DidNotSwapReason::SWAP_FAILS);
     result_->did_not_swap_called = true;
     result_->reason = reason;
+    return DidNotSwapAction::DEFAULT_ACTION;
   }
 
   int64_t TraceId() const override { return 0; }