Rename Maybe to Optional

talk/app/webrtc/videosource_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 374 matching lines @@
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
 }
 
 TEST_F(VideoSourceTest, SetValidOptionValues) {
   FakeConstraints constraints;
   constraints.AddMandatory(MediaConstraintsInterface::kNoiseReduction, "false");
 
   CreateVideoSource(&constraints);
 
-  EXPECT_EQ(rtc::Maybe<bool>(false), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(false),
+            source_->options()->video_noise_reduction);
 }
 
 TEST_F(VideoSourceTest, OptionNotSet) {
   FakeConstraints constraints;
   CreateVideoSource(&constraints);
-  EXPECT_EQ(rtc::Maybe<bool>(), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(), source_->options()->video_noise_reduction);
 }
 
 TEST_F(VideoSourceTest, MandatoryOptionOverridesOptional) {
   FakeConstraints constraints;
   constraints.AddMandatory(
       MediaConstraintsInterface::kNoiseReduction, true);
   constraints.AddOptional(
       MediaConstraintsInterface::kNoiseReduction, false);
 
   CreateVideoSource(&constraints);
 
-  EXPECT_EQ(rtc::Maybe<bool>(true), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(true),
+            source_->options()->video_noise_reduction);
 }
 
 TEST_F(VideoSourceTest, InvalidOptionKeyOptional) {
   FakeConstraints constraints;
   constraints.AddOptional(
       MediaConstraintsInterface::kNoiseReduction, false);
   constraints.AddOptional("invalidKey", false);
 
   CreateVideoSource(&constraints);
 
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
       kMaxWaitMs);
-  EXPECT_EQ(rtc::Maybe<bool>(false), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(false),
+            source_->options()->video_noise_reduction);
 }
 
 TEST_F(VideoSourceTest, InvalidOptionKeyMandatory) {
   FakeConstraints constraints;
   constraints.AddMandatory(
       MediaConstraintsInterface::kNoiseReduction, false);
   constraints.AddMandatory("invalidKey", false);
 
   CreateVideoSource(&constraints);
 
   EXPECT_EQ_WAIT(MediaSourceInterface::kEnded, state_observer_->state(),
       kMaxWaitMs);
-  EXPECT_EQ(rtc::Maybe<bool>(), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(), source_->options()->video_noise_reduction);
 }
 
 TEST_F(VideoSourceTest, InvalidOptionValueOptional) {
   FakeConstraints constraints;
   constraints.AddOptional(
       MediaConstraintsInterface::kNoiseReduction, "not a boolean");
 
   CreateVideoSource(&constraints);
 
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
       kMaxWaitMs);
-  EXPECT_EQ(rtc::Maybe<bool>(), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(), source_->options()->video_noise_reduction);
 }
 
 TEST_F(VideoSourceTest, InvalidOptionValueMandatory) {
   FakeConstraints constraints;
   // Optional constraints should be ignored if the mandatory constraints fail.
   constraints.AddOptional(
       MediaConstraintsInterface::kNoiseReduction, "false");
   // Values are case-sensitive and must be all lower-case.
   constraints.AddMandatory(
       MediaConstraintsInterface::kNoiseReduction, "True");
 
   CreateVideoSource(&constraints);
 
   EXPECT_EQ_WAIT(MediaSourceInterface::kEnded, state_observer_->state(),
       kMaxWaitMs);
-  EXPECT_EQ(rtc::Maybe<bool>(), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(), source_->options()->video_noise_reduction);
 }
 
 TEST_F(VideoSourceTest, MixedOptionsAndConstraints) {
   FakeConstraints constraints;
   constraints.AddMandatory(MediaConstraintsInterface::kMaxWidth, 352);
   constraints.AddMandatory(MediaConstraintsInterface::kMaxHeight, 288);
   constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 5);
 
   constraints.AddMandatory(
       MediaConstraintsInterface::kNoiseReduction, false);
   constraints.AddOptional(
       MediaConstraintsInterface::kNoiseReduction, true);
 
   CreateVideoSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(352, format->width);
   EXPECT_EQ(288, format->height);
   EXPECT_EQ(30, format->framerate());
 
-  EXPECT_EQ(rtc::Maybe<bool>(false), source_->options()->video_noise_reduction);
+  EXPECT_EQ(rtc::Optional<bool>(false),
+            source_->options()->video_noise_reduction);
 }
 
 // Tests that the source starts video with the default resolution for
 // screencast if no constraint is set.
 TEST_F(VideoSourceTest, ScreencastResolutionNoConstraint) {
   capturer_->TestWithoutCameraFormats();
   capturer_->SetScreencast(true);
 
   CreateVideoSource();
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
@@ skipping 40 matching lines @@
   constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
 
   CreateVideoSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(30, format->framerate());
 }