Reland of move deprecated CodecType methods.

webrtc/common_types.cc

Index: webrtc/common_types.cc
diff --git a/webrtc/common_types.cc b/webrtc/common_types.cc
index 82307ce52b37393837d79bde3938ba101ab60c0c..6cf7304ad83cce8f3ceaa7f91064e837f7378d39 100644
--- a/webrtc/common_types.cc
+++ b/webrtc/common_types.cc
@@ -168,16 +168,6 @@
   return kVideoCodecGeneric;
 }
 
-// TODO(kthelgason): Remove these methods once upstream projects
-// have been updated.
-rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type) {
-  return rtc::Optional<const char*>(CodecTypeToPayloadString(type));
-}
-
-rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name) {
-  return rtc::Optional<VideoCodecType>(PayloadStringToCodecType(name));
-}
-
 const uint32_t BitrateAllocation::kMaxBitrateBps =
     std::numeric_limits<uint32_t>::max();