Revert "Pull AudioDestinationConsumer off the Blink GC heap."

third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 130 matching lines @@
   ASSERT(!m_private.isNull());
   return m_private->constraints();
 }
 
 bool WebMediaStreamSource::requiresAudioConsumer() const {
   ASSERT(!m_private.isNull());
   return m_private->requiresAudioConsumer();
 }
 
 class ConsumerWrapper final : public AudioDestinationConsumer {
-  USING_FAST_MALLOC(ConsumerWrapper);
-
  public:
   static ConsumerWrapper* create(WebAudioDestinationConsumer* consumer) {
     return new ConsumerWrapper(consumer);
   }
 
   void setFormat(size_t numberOfChannels, float sampleRate) override;
   void consumeAudio(AudioBus*, size_t numberOfFrames) override;
 
   WebAudioDestinationConsumer* consumer() { return m_consumer; }
 
@@ skipping 28 matching lines @@
   ASSERT(!m_private.isNull() && consumer);
 
   m_private->addAudioConsumer(ConsumerWrapper::create(consumer));
 }
 
 bool WebMediaStreamSource::removeAudioConsumer(
     WebAudioDestinationConsumer* consumer) {
   ASSERT(isMainThread());
   ASSERT(!m_private.isNull() && consumer);
 
-  const HashSet<AudioDestinationConsumer*>& consumers =
+  const HeapHashSet<Member<AudioDestinationConsumer>>& consumers =
       m_private->audioConsumers();
-  for (AudioDestinationConsumer* it : consumers) {
-    ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it);
+  for (HeapHashSet<Member<AudioDestinationConsumer>>::const_iterator it =
+           consumers.begin();
+       it != consumers.end(); ++it) {
+    ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get());
     if (wrapper->consumer() == consumer) {
       m_private->removeAudioConsumer(wrapper);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace blink