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

cc/surfaces/frame_sink_manager.cc

Index: cc/surfaces/frame_sink_manager.cc
diff --git a/cc/surfaces/frame_sink_manager.cc b/cc/surfaces/frame_sink_manager.cc
index 22f1d172dfcb8b4dcfb5799d211c5a4c8808e3b2..c16a921fc47a38413dc4e0724903b8e7171c4815 100644
--- a/cc/surfaces/frame_sink_manager.cc
+++ b/cc/surfaces/frame_sink_manager.cc
@@ -9,7 +9,6 @@
 
 #include "base/logging.h"
 #include "cc/surfaces/frame_sink_manager_client.h"
-#include "cc/surfaces/primary_begin_frame_source.h"
 
 #if DCHECK_IS_ON()
 #include <sstream>
@@ -17,14 +16,15 @@
 
 namespace cc {
 
-FrameSinkManager::FrameSinkSourceMapping::FrameSinkSourceMapping() = default;
+FrameSinkManager::FrameSinkSourceMapping::FrameSinkSourceMapping()
+    : source(nullptr) {}
 
 FrameSinkManager::FrameSinkSourceMapping::FrameSinkSourceMapping(
     const FrameSinkSourceMapping& other) = default;
 
-FrameSinkManager::FrameSinkSourceMapping::~FrameSinkSourceMapping() = default;
-
-FrameSinkManager::FrameSinkManager() = default;
+FrameSinkManager::FrameSinkSourceMapping::~FrameSinkSourceMapping() {}
+
+FrameSinkManager::FrameSinkManager() {}
 
 FrameSinkManager::~FrameSinkManager() {
   // All CompositorFrameSinks should be unregistered prior to
@@ -82,8 +82,6 @@
 
   registered_sources_[source] = frame_sink_id;
   RecursivelyAttachBeginFrameSource(frame_sink_id, source);
-
-  primary_source_.OnBeginFrameSourceAdded(source);
 }
 
 void FrameSinkManager::UnregisterBeginFrameSource(BeginFrameSource* source) {
@@ -92,8 +90,6 @@
 
   FrameSinkId frame_sink_id = registered_sources_[source];
   registered_sources_.erase(source);
-
-  primary_source_.OnBeginFrameSourceRemoved(source);
 
   if (frame_sink_source_map_.count(frame_sink_id) == 0u)
     return;
@@ -105,10 +101,6 @@
   // became null because of the previous step but that have an alternative.
   for (auto source_iter : registered_sources_)
     RecursivelyAttachBeginFrameSource(source_iter.second, source_iter.first);
-}
-
-BeginFrameSource* FrameSinkManager::GetPrimaryBeginFrameSource() {
-  return &primary_source_;
 }
 
 void FrameSinkManager::RecursivelyAttachBeginFrameSource(