Revert "Pull AudioDestinationConsumer off the Blink GC heap."

third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp

 /*
  * Copyright (C) 2012 Google Inc. 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 67 matching lines @@
 void MediaStreamSource::addAudioConsumer(AudioDestinationConsumer* consumer) {
   ASSERT(m_requiresConsumer);
   MutexLocker locker(m_audioConsumersLock);
   m_audioConsumers.insert(consumer);
 }
 
 bool MediaStreamSource::removeAudioConsumer(
     AudioDestinationConsumer* consumer) {
   ASSERT(m_requiresConsumer);
   MutexLocker locker(m_audioConsumersLock);
-  auto it = m_audioConsumers.find(consumer);
+  HeapHashSet<Member<AudioDestinationConsumer>>::iterator it =
+      m_audioConsumers.find(consumer);
   if (it == m_audioConsumers.end())
     return false;
   m_audioConsumers.erase(it);
   return true;
 }
 
 void MediaStreamSource::getSettings(WebMediaStreamTrack::Settings& settings) {
   settings.deviceId = id();
 }
 
 void MediaStreamSource::setAudioFormat(size_t numberOfChannels,
                                        float sampleRate) {
   ASSERT(m_requiresConsumer);
   MutexLocker locker(m_audioConsumersLock);
-  for (AudioDestinationConsumer* consumer : m_audioConsumers)
-    consumer->setFormat(numberOfChannels, sampleRate);
+  for (HeapHashSet<Member<AudioDestinationConsumer>>::iterator it =
+           m_audioConsumers.begin();
+       it != m_audioConsumers.end(); ++it)
+    (*it)->setFormat(numberOfChannels, sampleRate);
 }
 
 void MediaStreamSource::consumeAudio(AudioBus* bus, size_t numberOfFrames) {
   ASSERT(m_requiresConsumer);
   MutexLocker locker(m_audioConsumersLock);
   // Prevent GCs from going ahead while this iteration runs, attempting to
   // pinpoint crbug.com/682945 failures.
   ThreadState::MainThreadGCForbiddenScope scope;
-  for (AudioDestinationConsumer* consumer : m_audioConsumers)
-    consumer->consumeAudio(bus, numberOfFrames);
+  for (HeapHashSet<Member<AudioDestinationConsumer>>::iterator it =
+           m_audioConsumers.begin();
+       it != m_audioConsumers.end(); ++it)
+    (*it)->consumeAudio(bus, numberOfFrames);
 }
 
 DEFINE_TRACE(MediaStreamSource) {
   visitor->trace(m_observers);
+  visitor->trace(m_audioConsumers);
 }
 
 }  // namespace blink