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

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 57 matching lines @@
     DEFINE_STATIC_LOCAL(String, audioKind, ("audio"));
     DEFINE_STATIC_LOCAL(String, videoKind, ("video"));
 
     switch (m_component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         return audioKind;
     case MediaStreamSource::TypeVideo:
         return videoKind;
     }
 
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return audioKind;
 }
 
 String MediaStreamTrack::id() const
 {
     return m_component->id();
 }
 
 String MediaStreamTrack::label() const
 {
@@ skipping 38 matching lines @@
 
     switch (m_readyState) {
     case MediaStreamSource::ReadyStateLive:
         return "live";
     case MediaStreamSource::ReadyStateMuted:
         return "muted";
     case MediaStreamSource::ReadyStateEnded:
         return "ended";
     }
 
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return String();
 }
 
 void MediaStreamTrack::getSources(ExecutionContext* context, MediaStreamTrackSourcesCallback* callback, ExceptionState& exceptionState)
 {
     LocalFrame* frame = toDocument(context)->frame();
     UserMediaController* userMedia = UserMediaController::from(frame);
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No sources controller available; is this a detached window?");
         return;
@@ skipping 44 matching lines @@
         break;
     case MediaStreamSource::ReadyStateEnded:
         dispatchEvent(Event::create(EventTypeNames::ended));
         propagateTrackEnded();
         break;
     }
 }
 
 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)
         (*iter)->trackEnded();
     m_isIteratingRegisteredMediaStreams = false;
 }
 
 void MediaStreamTrack::stop()
 {
     m_stopped = true;
@@ skipping 16 matching lines @@
     return !ended() && hasEventListeners(EventTypeNames::ended);
 }
 
 PassOwnPtr<AudioSourceProvider> MediaStreamTrack::createWebAudioSource()
 {
     return MediaStreamCenter::instance().createWebAudioSourceFromMediaStreamTrack(component());
 }
 
 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);
 }
 
 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());
     m_registeredMediaStreams.remove(iter);
 }
 
 const AtomicString& MediaStreamTrack::interfaceName() const
 {
     return EventTargetNames::MediaStreamTrack;
 }
 
 ExecutionContext* MediaStreamTrack::getExecutionContext() const
 {
     return ActiveDOMObject::getExecutionContext();
 }
 
 DEFINE_TRACE(MediaStreamTrack)
 {
     visitor->trace(m_registeredMediaStreams);
     visitor->trace(m_component);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink