Add support for cancellation of demuxer reads.

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 d6b86168fa7d1fdc28b9f74770d5e9b12d0974b6..6242881226f5890d727b6f0e0842256b5bd582e6 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -612,11 +612,11 @@ TEST_F(MultibufferDataSourceTest, Http_AbortWhileReading) {
   ReadAt(kFileSize);
 
   // Abort!!!
-  EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError));
+  EXPECT_CALL(*this, ReadCallback(media::DataSource::kAborted));
   data_source_->Abort();
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_FALSE(loading());
+  EXPECT_TRUE(loading());
   Stop();
 }
 
@@ -627,11 +627,11 @@ TEST_F(MultibufferDataSourceTest, File_AbortWhileReading) {
   ReadAt(kFileSize);
 
   // Abort!!!
-  EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError));
+  EXPECT_CALL(*this, ReadCallback(media::DataSource::kAborted));
   data_source_->Abort();
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_FALSE(loading());
+  EXPECT_TRUE(loading());
   Stop();
 }