Cast: Refactoring Cast API's

media/cast/test/end2end_unittest.cc

Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 82fc568d2d2b959c96cedc276c9e8f0008cd87a9..e9c5ae6eaff79c9e9dbe2672990c88c150d3691e 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -406,7 +406,9 @@ class End2EndTest : public ::testing::Test {
         receiver_to_sender_(cast_environment_),
         sender_to_receiver_(cast_environment_),
         test_receiver_audio_callback_(new TestReceiverAudioCallback()),
-        test_receiver_video_callback_(new TestReceiverVideoCallback()) {
+        test_receiver_video_callback_(new TestReceiverVideoCallback()),
+        audio_initialization_cnt_(0),
+        video_initialization_cnt_(0) {
     testing_clock_->Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
     cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber_);
@@ -487,14 +489,15 @@ class End2EndTest : public ::testing::Test {
         task_runner_,
         &sender_to_receiver_));
 
-    cast_sender_.reset(CastSender::CreateCastSender(
+    cast_sender_.reset(CastSender::Create(
         cast_environment_,
-        &audio_sender_config_,
-        &video_sender_config_,
-        NULL,
         base::Bind(&End2EndTest::InitializationResult, base::Unretained(this)),
         transport_sender_.get()));
 
+    // Initializing audio and video senders.
+    cast_sender_->InitializeAudio(audio_sender_config_);
+    cast_sender_->InitializeVideo(video_sender_config_, NULL);
+
     receiver_to_sender_.SetPacketReceiver(cast_sender_->packet_receiver());
     sender_to_receiver_.SetPacketReceiver(cast_receiver_->packet_receiver());
 
@@ -542,7 +545,17 @@ class End2EndTest : public ::testing::Test {
   }
 
   void InitializationResult(CastInitializationStatus result) {
-    EXPECT_EQ(result, STATUS_INITIALIZED);
+    // Result should be STATUS_AUDIO_INITIALIZED or STATUS_VIDEO_INITIALIZED;
+    // each should be called only once.
+    if (result == STATUS_AUDIO_INITIALIZED) {
+      ++audio_initialization_cnt_;
+    } else if (result == STATUS_VIDEO_INITIALIZED) {
+      ++video_initialization_cnt_;
+    } else {
+      ASSERT_TRUE(false);

[Ami GONE FROM CHROMIUM, 2014/02/14 18:23:54]

FAIL()

[mikhal1, 2014/02/18 19:20:43]

Done.

+    }
+    EXPECT_GE(1, audio_initialization_cnt_);
+    EXPECT_GE(1, video_initialization_cnt_);

[Ami GONE FROM CHROMIUM, 2014/02/14 18:23:54]

s/GE/EQ/ here and on the previous line?

[mikhal1, 2014/02/18 19:20:43]

Don't get the comment. Each can be either 0 or 1, depending on the order of the
initialization.
On 2014/02/14 18:23:54, Ami Fischman wrote:

   }
 
   AudioReceiverConfig audio_receiver_config_;
@@ -574,6 +587,8 @@ class End2EndTest : public ::testing::Test {
   std::vector<FrameEvent> frame_events_;
   std::vector<PacketEvent> packet_events_;
   std::vector<GenericEvent> generic_events_;
+  int audio_initialization_cnt_;
+  int video_initialization_cnt_;
 };
 
 #if defined(OS_WIN)