Index: talk/app/webrtc/localaudiosource_unittest.cc |
diff --git a/talk/app/webrtc/localaudiosource_unittest.cc b/talk/app/webrtc/localaudiosource_unittest.cc |
index d36b7cd9c22e2b99b91a527d9ed8de8ef0025424..75d0c354622925e722b629a33065744b4afd5936 100644 |
--- a/talk/app/webrtc/localaudiosource_unittest.cc |
+++ b/talk/app/webrtc/localaudiosource_unittest.cc |
@@ -58,14 +58,14 @@ TEST(LocalAudioSourceTest, SetValidOptions) { |
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), |
&constraints); |
- EXPECT_EQ(rtc::Maybe<bool>(false), source->options().echo_cancellation); |
- EXPECT_EQ(rtc::Maybe<bool>(true), source->options().extended_filter_aec); |
- EXPECT_EQ(rtc::Maybe<bool>(true), source->options().delay_agnostic_aec); |
- EXPECT_EQ(rtc::Maybe<bool>(true), source->options().auto_gain_control); |
- EXPECT_EQ(rtc::Maybe<bool>(true), source->options().experimental_agc); |
- EXPECT_EQ(rtc::Maybe<bool>(false), source->options().noise_suppression); |
- EXPECT_EQ(rtc::Maybe<bool>(true), source->options().highpass_filter); |
- EXPECT_EQ(rtc::Maybe<bool>(true), source->options().aec_dump); |
+ EXPECT_EQ(rtc::Optional<bool>(false), source->options().echo_cancellation); |
+ EXPECT_EQ(rtc::Optional<bool>(true), source->options().extended_filter_aec); |
+ EXPECT_EQ(rtc::Optional<bool>(true), source->options().delay_agnostic_aec); |
+ EXPECT_EQ(rtc::Optional<bool>(true), source->options().auto_gain_control); |
+ EXPECT_EQ(rtc::Optional<bool>(true), source->options().experimental_agc); |
+ EXPECT_EQ(rtc::Optional<bool>(false), source->options().noise_suppression); |
+ EXPECT_EQ(rtc::Optional<bool>(true), source->options().highpass_filter); |
+ EXPECT_EQ(rtc::Optional<bool>(true), source->options().aec_dump); |
} |
TEST(LocalAudioSourceTest, OptionNotSet) { |
@@ -73,7 +73,7 @@ TEST(LocalAudioSourceTest, OptionNotSet) { |
rtc::scoped_refptr<LocalAudioSource> source = |
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), |
&constraints); |
- EXPECT_EQ(rtc::Maybe<bool>(), source->options().highpass_filter); |
+ EXPECT_EQ(rtc::Optional<bool>(), source->options().highpass_filter); |
} |
TEST(LocalAudioSourceTest, MandatoryOverridesOptional) { |
@@ -87,7 +87,7 @@ TEST(LocalAudioSourceTest, MandatoryOverridesOptional) { |
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), |
&constraints); |
- EXPECT_EQ(rtc::Maybe<bool>(false), source->options().echo_cancellation); |
+ EXPECT_EQ(rtc::Optional<bool>(false), source->options().echo_cancellation); |
} |
TEST(LocalAudioSourceTest, InvalidOptional) { |
@@ -100,7 +100,7 @@ TEST(LocalAudioSourceTest, InvalidOptional) { |
&constraints); |
EXPECT_EQ(MediaSourceInterface::kLive, source->state()); |
- EXPECT_EQ(rtc::Maybe<bool>(false), source->options().highpass_filter); |
+ EXPECT_EQ(rtc::Optional<bool>(false), source->options().highpass_filter); |
} |
TEST(LocalAudioSourceTest, InvalidMandatory) { |
@@ -113,5 +113,5 @@ TEST(LocalAudioSourceTest, InvalidMandatory) { |
&constraints); |
EXPECT_EQ(MediaSourceInterface::kLive, source->state()); |
- EXPECT_EQ(rtc::Maybe<bool>(false), source->options().highpass_filter); |
+ EXPECT_EQ(rtc::Optional<bool>(false), source->options().highpass_filter); |
} |