Revert of Revert "Pull AudioDestinationConsumer off the Blink GC heap."

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

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * 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.
@@ skipping 84 matching lines @@
   }
   WebMediaConstraints constraints() { return m_constraints; }
   void getSettings(WebMediaStreamTrack::Settings&);
 
   void setAudioFormat(size_t numberOfChannels, float sampleRate);
   void consumeAudio(AudioBus*, size_t numberOfFrames);
 
   bool requiresAudioConsumer() const { return m_requiresConsumer; }
   void addAudioConsumer(AudioDestinationConsumer*);
   bool removeAudioConsumer(AudioDestinationConsumer*);
-  const HeapHashSet<Member<AudioDestinationConsumer>>& audioConsumers() {
+  const HashSet<AudioDestinationConsumer*>& audioConsumers() {
     return m_audioConsumers;
   }
 
   // |m_extraData| may hold pointers to GC objects, and it may touch them in
   // destruction.  So this class is eagerly finalized to finalize |m_extraData|
   // promptly.
   EAGERLY_FINALIZE();
   DECLARE_TRACE();
 
  private:
   MediaStreamSource(const String& id,
                     StreamType,
                     const String& name,
                     ReadyState,
                     bool requiresConsumer);
 
   String m_id;
   StreamType m_type;
   String m_name;
   ReadyState m_readyState;
   bool m_requiresConsumer;
   HeapHashSet<WeakMember<Observer>> m_observers;
   Mutex m_audioConsumersLock;
-  HeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers;
+  HashSet<AudioDestinationConsumer*> m_audioConsumers;
   std::unique_ptr<ExtraData> m_extraData;
   WebMediaConstraints m_constraints;
 };
 
 typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector;
 
 }  // namespace blink
 
 #endif  // MediaStreamSource_h