From 1a92d0de49779567241e97e50cb69d51257adcce Mon Sep 17 00:00:00 2001
From: kthelgason <kthelgason@webrtc.org>
Date: Mon, 28 Aug 2017 06:16:02 -0700
Subject: [PATCH] Remove deprecated CodecType methods.

These are no longer needed as all clients have been updated to use the
new methods that always return a value.

BUG=None

Review-Url: https://codereview.webrtc.org/3009583002
Cr-Commit-Position: refs/heads/master@{#19559}
---
 webrtc/common_types.cc | 10 ----------
 webrtc/common_types.h  |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/webrtc/common_types.cc b/webrtc/common_types.cc
index 82307ce52b..6cf7304ad8 100644
--- a/webrtc/common_types.cc
+++ b/webrtc/common_types.cc
@@ -168,16 +168,6 @@ VideoCodecType PayloadStringToCodecType(const std::string& name) {
   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();
 
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index c4b5ce8e70..843d9b8584 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -550,10 +550,6 @@ enum VideoCodecType {
 // Translates from name of codec to codec type and vice versa.
 const char* CodecTypeToPayloadString(VideoCodecType type);
 VideoCodecType PayloadStringToCodecType(const std::string& name);
-// TODO(kthelgason): Remove these methods once upstream projects
-// have been updated.
-rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type);
-rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name);
 
 union VideoCodecUnion {
   VideoCodecVP8 VP8;