Rename Maybe to Optional

webrtc/modules/audio_coding/main/acm2/codec_manager.cc

Index: webrtc/modules/audio_coding/main/acm2/codec_manager.cc
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc
index 6a3388619249c413ed0ac2f5d91142ee7f5529a9..e4070c76aef7648c5ecba92a0fea1bff06d9e70b 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc
+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc
@@ -328,7 +328,7 @@ void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) {
   codec_owner_.SetEncoders(external_speech_encoder, cng_pt, vad_mode_, red_pt);
 }
 
-rtc::Maybe<CodecInst> CodecManager::GetCodecInst() const {
+rtc::Optional<CodecInst> CodecManager::GetCodecInst() const {
   int dummy_id = 0;
   WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, dummy_id,
                "SendCodec()");
@@ -336,9 +336,9 @@ rtc::Maybe<CodecInst> CodecManager::GetCodecInst() const {
   if (!codec_owner_.Encoder()) {
     WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, dummy_id,
                  "SendCodec Failed, no codec is registered");
-    return rtc::Maybe<CodecInst>();
+    return rtc::Optional<CodecInst>();
   }
-  return rtc::Maybe<CodecInst>(send_codec_inst_);
+  return rtc::Optional<CodecInst>(send_codec_inst_);
 }
 
 bool CodecManager::SetCopyRed(bool enable) {