Improve retry support for media network loading.

media/blink/multibuffer_data_source_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 304 matching lines @@
   }
 
   void FinishLoading() {
     EXPECT_TRUE(url_loader());
     if (!url_loader())
       return;
     data_provider()->didFinishLoading(url_loader(), 0, -1);
     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());
     if (!data_provider())
       return;
     data_provider()->Start();
   }
 
   MOCK_METHOD1(ReadCallback, void(int size));
 
@@ skipping 451 matching lines @@
   EXPECT_TRUE(loading());
   Stop();
 }
 
 TEST_F(MultibufferDataSourceTest, Http_TooManyRetries) {
   InitializeWith206Response();
 
   // 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));
+  for (int i = 0; i < ResourceMultiBufferDataProvider::kMaxRetries; i++) {
+    FailLoading();
+    data_provider()->Start();
+    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();
-
+  // 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();
 }
 
 TEST_F(MultibufferDataSourceTest, File_TooManyRetries) {
   InitializeWithFileResponse();
 
   // 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));
+  for (int i = 0; i < ResourceMultiBufferDataProvider::kMaxRetries; i++) {
+    FailLoading();
+    data_provider()->Start();
+    Respond(response_generator_->Generate206(kDataSize));
+  }
 
-  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();
-
+  // 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();
 }
 
 TEST_F(MultibufferDataSourceTest, File_InstanceSizeUnknown) {
   Initialize(kFileUrl, false);
 
   Respond(
       response_generator_->GenerateFileResponse(media::DataSource::kReadError));
   ReceiveData(kDataSize);
@@ skipping 422 matching lines @@
   data_provider()->willFollowRedirect(url_loader(), request, response);
   Respond(response_generator_->Generate206(kDataSize));
   ReceiveData(kDataSize);
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 3));
   FinishLoading();
   EXPECT_FALSE(loading());
   Stop();
 }
 
 }  // namespace media