Revert of cc::SurfaceDependencyTracker should not crash when a Display goes away

cc/test/begin_frame_source_test.cc

Index: cc/test/begin_frame_source_test.cc
diff --git a/cc/test/begin_frame_source_test.cc b/cc/test/begin_frame_source_test.cc
index 411250864ca96212beea22d00de8ad41af2225b1..304f77aa8aa81e6410e116431f2da0c0e19f1694 100644
--- a/cc/test/begin_frame_source_test.cc
+++ b/cc/test/begin_frame_source_test.cc
@@ -20,8 +20,9 @@
 
 MockBeginFrameObserver::MockBeginFrameObserver()
     : last_begin_frame_args(kDefaultBeginFrameArgs) {
-  ON_CALL(*this, LastUsedBeginFrameArgs())
-      .WillByDefault(::testing::ReturnPointee(&last_begin_frame_args));
+  EXPECT_CALL(*this, LastUsedBeginFrameArgs())
+      .Times(::testing::AnyNumber())
+      .WillRepeatedly(::testing::ReturnPointee(&last_begin_frame_args));
 }
 
 MockBeginFrameObserver::~MockBeginFrameObserver() {}