Rename Maybe to Optional

talk/session/media/channel.cc

Index: talk/session/media/channel.cc
diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
index 0e34cbfaacc8eabfb75de187762d5bb2846dcbd9..ae27e332f870e8ec7eb87c04ac60de43c8ac904c 100644
--- a/talk/session/media/channel.cc
+++ b/talk/session/media/channel.cc
@@ -1502,7 +1502,7 @@ bool VoiceChannel::SetRemoteContent_w(const MediaContentDescription* content,
   AudioSendParameters send_params = last_send_params_;
   RtpSendParametersFromMediaDescription(audio, &send_params);
   if (audio->agc_minus_10db()) {
-    send_params.options.adjust_agc_delta = rtc::Maybe<int>(kAgcMinus10db);
+    send_params.options.adjust_agc_delta = rtc::Optional<int>(kAgcMinus10db);
   }
   if (!media_channel()->SetSendParameters(send_params)) {
     SafeSetError("Failed to set remote audio description send parameters.",
@@ -1789,7 +1789,7 @@ bool VideoChannel::SetRemoteContent_w(const MediaContentDescription* content,
   VideoSendParameters send_params = last_send_params_;
   RtpSendParametersFromMediaDescription(video, &send_params);
   if (video->conference_mode()) {
-    send_params.options.conference_mode = rtc::Maybe<bool>(true);
+    send_params.options.conference_mode = rtc::Optional<bool>(true);
   }
   if (!media_channel()->SetSendParameters(send_params)) {
     SafeSetError("Failed to set remote video description send parameters.",