Fix CompositorResizeLock to do something.

content/browser/renderer_host/browser_compositor_view_mac.mm

Index: content/browser/renderer_host/browser_compositor_view_mac.mm
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
index 7f2a79beee46d77d54e7f68b79ba31facdc8d2c3..3865f528dd1858f5fe38f3921caf7f963f3153f9 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -11,7 +11,6 @@
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/compositor/image_transport_factory.h"
-#include "content/browser/renderer_host/resize_lock.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
 #include "media/base/video_frame.h"
@@ -105,7 +104,6 @@ RecyclableCompositorMac::RecyclableCompositorMac()
                   ui::WindowResizeHelperMac::Get()->task_runner()) {
   compositor_.SetAcceleratedWidget(
       accelerated_widget_mac_->accelerated_widget());
-  compositor_.SetLocksWillTimeOut(false);
   Suspend();
   compositor_.AddObserver(this);
 }
@@ -115,7 +113,9 @@ RecyclableCompositorMac::~RecyclableCompositorMac() {
 }
 
 void RecyclableCompositorMac::Suspend() {
-  compositor_suspended_lock_ = compositor_.GetCompositorLock();
+  // Requests a compositor lock without a timeout.
+  compositor_suspended_lock_ =
+      compositor_.GetCompositorLock(nullptr, base::TimeDelta());
 }
 
 void RecyclableCompositorMac::Unsuspend() {
@@ -427,11 +427,10 @@ bool BrowserCompositorMac::DelegatedFrameCanCreateResizeLock() const {
   return false;
 }
 
-std::unique_ptr<ResizeLock>
-BrowserCompositorMac::DelegatedFrameHostCreateResizeLock(
-    bool defer_compositor_lock) {
+std::unique_ptr<CompositorResizeLock>
+BrowserCompositorMac::DelegatedFrameHostCreateResizeLock() {
   NOTREACHED();
-  return std::unique_ptr<ResizeLock>();
+  return nullptr;
 }
 
 void BrowserCompositorMac::DelegatedFrameHostResizeLockWasReleased() {