From dc80abe975e9523c9bb3eba65240538ee2478c72 Mon Sep 17 00:00:00 2001
From: kthelgason <kthelgason@webrtc.org>
Date: Wed, 13 Sep 2017 05:16:26 -0700
Subject: [PATCH] Reland of move deprecated CodecType methods. (patchset #1
 id:1 of https://codereview.webrtc.org/3010553002/ )

Reason for revert:
Fixes have landed in chromium.

Original issue's description:
> Revert of Remove deprecated CodecType methods. (patchset #1 id:1 of https://codereview.webrtc.org/3009583002/ )
>
> Reason for revert:
> It breaks chromium FYI bots.
>
> E.g.: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20Builder/builds/11615
>
> Original issue's description:
> > 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}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/1a92d0de49779567241e97e50cb69d51257adcce
>
> TBR=magjed@webrtc.org,tommi@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/3010553002
> Cr-Commit-Position: refs/heads/master@{#19563}
> Committed: https://chromium.googlesource.com/external/webrtc/+/673caedc39f8fc0975fb902041c9000c271bfccf

TBR=magjed@webrtc.org,tommi@webrtc.org,mbonadei@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=None

Review-Url: https://codereview.webrtc.org/3009413002
Cr-Commit-Position: refs/heads/master@{#19816}
---
 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 1ea40990f4..7a27fcb91a 100644
--- a/webrtc/common_types.cc
+++ b/webrtc/common_types.cc
@@ -178,16 +178,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 e5bd9a8741..9ad5165882 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -554,10 +554,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;