Improve retry support for media network loading.

media/blink/buffered_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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 615 matching lines @@
   EXPECT_TRUE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Http_TooManyRetries) {
   InitializeWith206Response();
 
   // Make sure there's a pending read -- we'll expect it to error.
   ReadAt(0);
 
-  // It'll try three times.
-  ExpectCreateResourceLoader();
-  FinishLoading();
-  Respond(response_generator_->Generate206(0));
-
-  ExpectCreateResourceLoader();
-  FinishLoading();
-  Respond(response_generator_->Generate206(0));
-
-  ExpectCreateResourceLoader();
-  FinishLoading();
-  Respond(response_generator_->Generate206(0));
+  for (int i = 0; i < 30; i++) {

[DaleCurtis, 2016/03/10 01:23:32]

Expose kLoaderRetries on the header file you can use here instead? Or better yet
since these test likely now take 30 seconds, add a SetRetryCountForTesting()
method which limits this to say 3 or 4 retries and ensures the delay grows
between each retry.

[hubbe, 2016/03/11 03:18:53]

Exposed kLoaderRetries.
These tests don't wait for the CB to execute, so they finish very quickly.

+    ExpectCreateResourceLoader();
+    FinishLoading();
+    Respond(response_generator_->Generate206(0));
+  }
 
   // It'll error after this.
   EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError));
   FinishLoading();
 
   EXPECT_FALSE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, File_TooManyRetries) {
   InitializeWithFileResponse();
 
   // Make sure there's a pending read -- we'll expect it to error.
   ReadAt(0);
 
-  // It'll try three times.
-  ExpectCreateResourceLoader();
-  FinishLoading();
-  Respond(response_generator_->GenerateFileResponse(0));
-
-  ExpectCreateResourceLoader();
-  FinishLoading();
-  Respond(response_generator_->GenerateFileResponse(0));
-
-  ExpectCreateResourceLoader();
-  FinishLoading();
-  Respond(response_generator_->GenerateFileResponse(0));
+  for (int i = 0; i < 30; i++) {

[DaleCurtis, 2016/03/10 01:23:32]

Ditto.

[hubbe, 2016/03/11 03:18:53]

Done.

+    ExpectCreateResourceLoader();
+    FinishLoading();
+    Respond(response_generator_->GenerateFileResponse(0));
+  }
 
   // It'll error after this.
   EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError));
   FinishLoading();
 
   EXPECT_FALSE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, File_InstanceSizeUnknown) {
@@ skipping 335 matching lines @@
   // Read a bit from the beginning.
   ReadAt(0);
   EXPECT_CALL(*this, ReadCallback(kDataSize));
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize - 1));
   ReceiveData(kDataSize);
 
   EXPECT_FALSE(active_loader());
 }
 
 }  // namespace media