Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Unified Diff: media/cast/test/end2end_unittest.cc

Issue 901833004: [Cast] Repurpose CastInitializationStatus for variable frame size support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fixes. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 46b5d7171b47afb6c86ef9f803616fe09ecb6fcc..e7a0c147805fb44b062c80f2807c0a4a09f1f162 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -103,12 +103,8 @@ void UpdateCastTransportStatus(CastTransportStatus status) {
EXPECT_TRUE(result);
}
-void AudioInitializationStatus(CastInitializationStatus status) {
- EXPECT_EQ(STATUS_AUDIO_INITIALIZED, status);
-}
-
-void VideoInitializationStatus(CastInitializationStatus status) {
- EXPECT_EQ(STATUS_VIDEO_INITIALIZED, status);
+void ExpectSuccessOperationalStatus(OperationalStatus status) {
+ EXPECT_EQ(STATUS_INITIALIZED, status);
}
// This is wrapped in a struct because it needs to be put into a std::map.
@@ -624,12 +620,14 @@ class End2EndTest : public ::testing::Test {
CastSender::Create(cast_environment_sender_, transport_sender_.get());
// Initializing audio and video senders.
- cast_sender_->InitializeAudio(audio_sender_config_,
- base::Bind(&AudioInitializationStatus));
- cast_sender_->InitializeVideo(video_sender_config_,
- base::Bind(&VideoInitializationStatus),
- CreateDefaultVideoEncodeAcceleratorCallback(),
- CreateDefaultVideoEncodeMemoryCallback());
+ cast_sender_->InitializeAudio(
+ audio_sender_config_,
+ base::Bind(&ExpectSuccessOperationalStatus));
+ cast_sender_->InitializeVideo(
+ video_sender_config_,
+ base::Bind(&ExpectSuccessOperationalStatus),
+ CreateDefaultVideoEncodeAcceleratorCallback(),
+ CreateDefaultVideoEncodeMemoryCallback());
task_runner_->RunTasks();
receiver_to_sender_.SetPacketReceiver(

Powered by Google App Engine
This is Rietveld 408576698