Improve retry support for media network loading.

media/blink/multibuffer_data_source_unittest.cc

Index: media/blink/multibuffer_data_source_unittest.cc
diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc
index ba90f1c62fbdef18c2b33f4a9c12f6b2fb63ccc4..d895ad7117629c3152cd437ab1d45bc63df05510 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -322,6 +322,12 @@ class MultibufferDataSourceTest : public testing::Test {
     message_loop_.RunUntilIdle();
   }
 
+  void FailLoading() {
+    data_provider()->didFail(url_loader(),
+                             response_generator_->GenerateError());
+    message_loop_.RunUntilIdle();
+  }
+
   void Restart() {
     EXPECT_TRUE(data_provider());
     EXPECT_FALSE(active_loader_allownull());
@@ -793,23 +799,19 @@ TEST_F(MultibufferDataSourceTest, Http_TooManyRetries) {
   // Make sure there's a pending read -- we'll expect it to error.
   ReadAt(kDataSize);
 
-  // It'll try three times.
-  FinishLoading();
-  Restart();
-  Respond(response_generator_->Generate206(kDataSize));
-
-  FinishLoading();
-  Restart();
-  Respond(response_generator_->Generate206(kDataSize));
-
-  FinishLoading();
-  Restart();
-  Respond(response_generator_->Generate206(kDataSize));
-
-  // It'll error after this.
-  EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError));
-  FinishLoading();
+  for (int i = 0; i < ResourceMultiBufferDataProvider::kMaxRetries; i++) {
+    FailLoading();
+    data_provider()->Start();
+    Respond(response_generator_->Generate206(kDataSize));
+  }
 
+  // Stop() will also cause the readback to be called with kReadError, but
+  // we want to make sure it was called during FailLoading().
+  bool failed_ = false;
+  EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError))
+      .WillOnce(Assign(&failed_, true));
+  FailLoading();
+  EXPECT_TRUE(failed_);
   EXPECT_FALSE(loading());
   Stop();
 }
@@ -820,23 +822,19 @@ TEST_F(MultibufferDataSourceTest, File_TooManyRetries) {
   // Make sure there's a pending read -- we'll expect it to error.
   ReadAt(kDataSize);
 
-  // It'll try three times.
-  FinishLoading();
-  Restart();
-  Respond(response_generator_->GenerateFileResponse(0));
-
-  FinishLoading();
-  Restart();
-  Respond(response_generator_->GenerateFileResponse(0));
-
-  FinishLoading();
-  Restart();
-  Respond(response_generator_->GenerateFileResponse(0));
-
-  // It'll error after this.
-  EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError));
-  FinishLoading();
+  for (int i = 0; i < ResourceMultiBufferDataProvider::kMaxRetries; i++) {
+    FailLoading();
+    data_provider()->Start();
+    Respond(response_generator_->Generate206(kDataSize));
+  }
 
+  // Stop() will also cause the readback to be called with kReadError, but
+  // we want to make sure it was called during FailLoading().
+  bool failed_ = false;
+  EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError))
+      .WillOnce(Assign(&failed_, true));
+  FailLoading();
+  EXPECT_TRUE(failed_);
   EXPECT_FALSE(loading());
   Stop();
 }