Update from https://crrev.com/314320

cc/surfaces/display.cc

Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index 72c31b5248c100b7216e746dcae353bbfc4b820a..ab1f0afcdf7790e08433b4d867c31a3d0c9eb9b4 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -4,8 +4,8 @@
 
 #include "cc/surfaces/display.h"
 
-#include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
+#include "base/trace_event/trace_event.h"
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ -198,9 +198,11 @@ SurfaceId Display::CurrentSurfaceId() {
 }
 
 int Display::GetMaxFramesPending() {
-  if (!output_surface_)
-    return OutputSurface::DEFAULT_MAX_FRAMES_PENDING;
-  return output_surface_->capabilities().max_frames_pending;
+  int max_frames_pending =
+      output_surface_ ? output_surface_->capabilities().max_frames_pending : 0;
+  if (max_frames_pending <= 0)
+    max_frames_pending = OutputSurface::DEFAULT_MAX_FRAMES_PENDING;
+  return max_frames_pending;
 }
 
 }  // namespace cc