Make RenderViewImpl::OnForceRedraw more robust

content/test/layouttest_support.cc

 // Copyright (c) 2012 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/public/test/layouttest_support.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 185 matching lines @@
 
   // cc::SwapPromise implementation.
   void OnCommit() override {
     output_surface_from_commit_ = output_surface_callback_.Run();
     DCHECK(output_surface_from_commit_);
   }
   void DidActivate() override {}
   void DidSwap(cc::CompositorFrameMetadata*) override {
     output_surface_from_commit_->RequestCopyOfOutput(std::move(copy_request_));
   }
-  void DidNotSwap(DidNotSwapReason r) override {
+  DidNotSwapAction DidNotSwap(DidNotSwapReason r) override {
     // The compositor should always swap in layout test mode.
     NOTREACHED() << "did not swap for reason " << r;
+    return DidNotSwapAction::BREAK_PROMISE;
   }
   int64_t TraceId() const override { return 0; }
 
  private:
   std::unique_ptr<cc::CopyOutputRequest> copy_request_;
   FindOutputSurfaceCallback output_surface_callback_;
   cc::TestDelegatingOutputSurface* output_surface_from_commit_ = nullptr;
 };
 
 }  // namespace
@@ skipping 344 matching lines @@
   return result;
 }
 
 void SchedulerRunIdleTasks(const base::Closure& callback) {
   blink::scheduler::RendererScheduler* scheduler =
       content::RenderThreadImpl::current()->GetRendererScheduler();
   blink::scheduler::RunIdleTasksForTesting(scheduler, callback);
 }
 
 }  // namespace content