WebKit MediaStream cleanup: ASSERT-->DCHECK and ASSERT_NOT_REACHED-->NOTREACHED etc

third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp

Index: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
index 927181a41d7313c744fde31bbfe2d12af6b54a9e..2c97b65b53dc04c85d1d6607917b4570ae5d7f10 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
@@ -75,7 +75,7 @@ String MediaStreamTrack::kind() const
         return videoKind;
     }
 
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return audioKind;
 }
 
@@ -134,7 +134,7 @@ String MediaStreamTrack::readyState() const
         return "ended";
     }
 
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return String();
 }
 
@@ -199,6 +199,7 @@ void MediaStreamTrack::sourceChangedState()
 
 void MediaStreamTrack::propagateTrackEnded()
 {
+    // TODO(mcasas): Substitute with CHECK, see https://crbug.com/599867.
     RELEASE_ASSERT(!m_isIteratingRegisteredMediaStreams);
     m_isIteratingRegisteredMediaStreams = true;
     for (HeapHashSet<Member<MediaStream>>::iterator iter = m_registeredMediaStreams.begin(); iter != m_registeredMediaStreams.end(); ++iter)
@@ -235,6 +236,7 @@ PassOwnPtr<AudioSourceProvider> MediaStreamTrack::createWebAudioSource()
 
 void MediaStreamTrack::registerMediaStream(MediaStream* mediaStream)
 {
+    // TODO(mcasas): Substitute with CHECK, see https://crbug.com/599867.
     RELEASE_ASSERT(!m_isIteratingRegisteredMediaStreams);
     RELEASE_ASSERT(!m_registeredMediaStreams.contains(mediaStream));
     m_registeredMediaStreams.add(mediaStream);
@@ -242,6 +244,7 @@ void MediaStreamTrack::registerMediaStream(MediaStream* mediaStream)
 
 void MediaStreamTrack::unregisterMediaStream(MediaStream* mediaStream)
 {
+    // TODO(mcasas): Substitute with CHECK, see https://crbug.com/599867.
     RELEASE_ASSERT(!m_isIteratingRegisteredMediaStreams);
     HeapHashSet<Member<MediaStream>>::iterator iter = m_registeredMediaStreams.find(mediaStream);
     RELEASE_ASSERT(iter != m_registeredMediaStreams.end());