Cherrypick Bugfix for cross-origin check

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 db4edbe3c9f74f0b38504d6681c1994329c62547..eecdb6cfccee43aa9326668f084ca4b80209ab8e 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -1425,4 +1425,34 @@ TEST_F(MultibufferDataSourceTest, LengthKnownAtEOF) {
   Stop();
 }
 
+TEST_F(MultibufferDataSourceTest, DidPassCORSAccessTest) {
+  InitializeWithCORS(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
+  set_preload(MultibufferDataSource::NONE);
+  WebURLResponse response1 =
+      response_generator_->GeneratePartial206(0, kDataSize - 1);
+  response1.setWasFetchedViaServiceWorker(true);
+  response1.setOriginalURLViaServiceWorker(GURL(kHttpDifferentOriginUrl));
+  WebURLResponse response2 =
+      response_generator_->GeneratePartial206(kDataSize, kDataSize * 2 - 1);
+
+  EXPECT_CALL(host_, SetTotalBytes(kFileSize));
+  EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize));
+  EXPECT_CALL(*this, ReadCallback(kDataSize));
+
+  EXPECT_FALSE(data_source_->DidPassCORSAccessCheck());
+  Respond(response1);
+  ReceiveData(kDataSize);
+  ReadAt(0);
+  EXPECT_TRUE(loading());
+  EXPECT_TRUE(data_source_->DidPassCORSAccessCheck());
+
+  FinishLoading();
+
+  // Verify that if reader_ is null, DidPassCORSAccessCheck still returns true.
+  data_source_->Stop();
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_TRUE(data_source_->DidPassCORSAccessCheck());
+}
+
 }  // namespace media