Reland "Removing webrtc::AudioFrame::energy_."

webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
index 2466112769eff5a389ccdd51a8f82b948acf9a5e..0fab84ba81ef91524230c7651b3d18d3567348bc 100644
--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
@@ -116,10 +116,6 @@ private:
     // Clears audioFrameList and reclaims all memory associated with it.
     void ClearAudioFrameList(AudioFrameList* audioFrameList) const;
 
-    // Update the list of MixerParticipants who have a positive VAD. mixList
-    // should be a list of AudioFrames
-    void UpdateVADPositiveParticipants(AudioFrameList* mixList) const;
-
     // This function returns true if it finds the MixerParticipant in the
     // specified list of MixerParticipants.
     bool IsParticipantInList(const MixerParticipant& participant,