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..ad19a65508f6146884f35350c33dd129bb099fc3 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -489,12 +489,13 @@ class End2EndTest : public ::testing::Test {
 
     cast_sender_.reset(CastSender::CreateCastSender(
         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 +543,9 @@ class End2EndTest : public ::testing::Test {
   }
 
   void InitializationResult(CastInitializationStatus result) {
-    EXPECT_EQ(result, STATUS_INITIALIZED);
+    bool end_result = result == STATUS_AUDIO_INITIALIZED ||
+                      result == STATUS_VIDEO_INITIALIZED;
+    EXPECT_TRUE(end_result);

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

Any desire to check that each status is hit exactly once?

[mikhal1, 2014/02/14 18:03:16]

Wasn't aware of one, but since you brought it up....
On 2014/02/13 18:02:14, Ami Fischman wrote:

   }
 
   AudioReceiverConfig audio_receiver_config_;