ACM: Remove unused and deprecated types

webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h

Index: webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h
diff --git a/webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h b/webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h
index 559c3fc7a0e2211ab423fb08a656cd065d8e1030..408bee24af0ef82338bb18c95c21ebd04415992c 100644
--- a/webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h
+++ b/webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h
@@ -19,31 +19,6 @@
 namespace webrtc {
 
 ///////////////////////////////////////////////////////////////////////////
-// enum ACMSpeechType
-// An enumerator for possible labels of a decoded frame.
-//
-// -normal      : a normal speech frame. If VAD is enabled on the
-//                incoming stream this label indicate that the
-//                frame is active.
-// -PLC         : a PLC frame. The corresponding packet was lost
-//                and this frame generated by PLC techniques.
-// -CNG         : the frame is comfort noise. This happens if VAD
-//                is enabled at the sender and we have received
-//                SID.
-// -PLCCNG      : PLC will fade to comfort noise if the duration
-//                of PLC is long. This labels such a case.
-// -VADPassive  : the VAD at the receiver recognizes this frame as
-//                passive.
-//
-enum ACMSpeechType {
-  normal = 0,
-  PLC = 1,
-  CNG = 2,
-  PLCCNG = 3,
-  VADPassive = 4
-};
-
-///////////////////////////////////////////////////////////////////////////
 // enum ACMVADMode
 // An enumerator for aggressiveness of VAD
 // -VADNormal                : least aggressive mode.
@@ -60,45 +35,6 @@ enum ACMVADMode {
 };
 
 ///////////////////////////////////////////////////////////////////////////
-// enum ACMCountries
-// An enumerator for countries, used when enabling CPT for a specific country.
-//
-enum ACMCountries {
-  ACMDisableCountryDetection = -1, // disable CPT detection
-  ACMUSA = 0,
-  ACMJapan,
-  ACMCanada,
-  ACMFrance,
-  ACMGermany,
-  ACMAustria,
-  ACMBelgium,
-  ACMUK,
-  ACMCzech,
-  ACMDenmark,
-  ACMFinland,
-  ACMGreece,
-  ACMHungary,
-  ACMIceland,
-  ACMIreland,
-  ACMItaly,
-  ACMLuxembourg,
-  ACMMexico,
-  ACMNorway,
-  ACMPoland,
-  ACMPortugal,
-  ACMSpain,
-  ACMSweden,
-  ACMTurkey,
-  ACMChina,
-  ACMHongkong,
-  ACMTaiwan,
-  ACMKorea,
-  ACMSingapore,
-  ACMNonStandard1
-// non-standard countries
-};
-
-///////////////////////////////////////////////////////////////////////////
 // enum ACMAMRPackingFormat
 // An enumerator for different bit-packing format of AMR codec according to
 // RFC 3267.
@@ -108,6 +44,8 @@ enum ACMCountries {
 // -AMROctetAlligned       : Octet-alligned mode.
 // -AMRFileStorage         : file-storage mode.
 //
+// TODO(henrik.lundin) Remove; only referenced in file_recorder, but all use
+// is no-op.
 enum ACMAMRPackingFormat {
   AMRUndefined = -1,
   AMRBandwidthEfficient = 0,
@@ -117,20 +55,6 @@ enum ACMAMRPackingFormat {
 
 ///////////////////////////////////////////////////////////////////////////
 //
-// Enumeration of background noise mode a mapping from NetEQ interface.
-//
-// -On                  : default "normal" behavior with eternal noise
-// -Fade                : noise fades to zero after some time
-// -Off                 : background noise is always zero
-//
-enum ACMBackgroundNoiseMode {
-  On,
-  Fade,
-  Off
-};
-
-///////////////////////////////////////////////////////////////////////////
-//
 // Enumeration of Opus mode for intended application.
 //
 // kVoip              : optimized for voice signals.