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

cc/surfaces/frame_sink_manager.h

Index: cc/surfaces/frame_sink_manager.h
diff --git a/cc/surfaces/frame_sink_manager.h b/cc/surfaces/frame_sink_manager.h
index 11c0f97668dcc0e59d6ae5d0124299be4f3b8377..0d54a8e3d8f002356887f22bc78f6e512d041401 100644
--- a/cc/surfaces/frame_sink_manager.h
+++ b/cc/surfaces/frame_sink_manager.h
@@ -14,7 +14,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "cc/surfaces/frame_sink_id.h"
-#include "cc/surfaces/primary_begin_frame_source.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
@@ -58,10 +57,6 @@
                                 const FrameSinkId& frame_sink_id);
   void UnregisterBeginFrameSource(BeginFrameSource* source);
 
-  // Returns a stable BeginFrameSource that forwards BeginFrames from the first
-  // available BeginFrameSource.
-  BeginFrameSource* GetPrimaryBeginFrameSource();
-
   // Register a relationship between two framesinks.  This relationship means
   // that surfaces from the child framesik will be displayed in the parent.
   // Children are allowed to use any begin frame source that their parent can
@@ -104,7 +99,7 @@
     ~FrameSinkSourceMapping();
     bool has_children() const { return !children.empty(); }
     // The currently assigned begin frame source for this client.
-    BeginFrameSource* source = nullptr;
+    BeginFrameSource* source;
     // This represents a dag of parent -> children mapping.
     std::vector<FrameSinkId> children;
   };
@@ -115,12 +110,10 @@
   std::unordered_map<FrameSinkId, FrameSinkSourceMapping, FrameSinkIdHash>
       frame_sink_source_map_;
 
-  // Set of BeginFrameSource along with associated FrameSinkIds. Any child
+  // Set of which sources are registered to which frmesinks.  Any child
   // that is implicitly using this framesink must be reachable by the
   // parent in the dag.
   std::unordered_map<BeginFrameSource*, FrameSinkId> registered_sources_;
-
-  PrimaryBeginFrameSource primary_source_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameSinkManager);
 };