Tie multibuffers to URLs

media/blink/multibuffer_unittest.cc

Index: media/blink/multibuffer_unittest.cc
diff --git a/media/blink/multibuffer_unittest.cc b/media/blink/multibuffer_unittest.cc
index badfc4c181f4716d5bb38af80566e2635847e3be..ca9a73eabb484d7437bbb498e2f02bd1cc8b2e22 100644
--- a/media/blink/multibuffer_unittest.cc
+++ b/media/blink/multibuffer_unittest.cc
@@ -18,25 +18,28 @@ const int kBlockSizeShift = 8;
 const size_t kBlockSize = 1UL << kBlockSizeShift;
 
 namespace media {
-class TestMultiBufferDataProvider;
 
-std::vector<TestMultiBufferDataProvider*> writers;
+class FakeMultiBufferDataProvider;
 
-class TestMultiBufferDataProvider : public media::MultiBuffer::DataProvider {
+std::vector<FakeMultiBufferDataProvider*> writers;

[xhwang, 2015/11/19 23:34:17]

move this to an anonymous or internal namespace?

[hubbe, 2015/11/20 23:24:23]

Done.

+
+class FakeMultiBufferDataProvider : public media::MultiBuffer::DataProvider {
  public:
-  TestMultiBufferDataProvider(MultiBufferBlockId pos,
+  FakeMultiBufferDataProvider(MultiBufferBlockId pos,
                               size_t file_size,
                               int max_blocks_after_defer,
-                              bool must_read_whole_file)
+                              bool must_read_whole_file,
+                              MultiBuffer* multibuffer)
       : pos_(pos),
         blocks_until_deferred_(1 << 30),
         max_blocks_after_defer_(max_blocks_after_defer),
         file_size_(file_size),
-        must_read_whole_file_(must_read_whole_file) {
+        must_read_whole_file_(must_read_whole_file),
+        multibuffer_(multibuffer) {
     writers.push_back(this);
   }
 
-  ~TestMultiBufferDataProvider() override {
+  ~FakeMultiBufferDataProvider() override {
     if (must_read_whole_file_) {
       CHECK_GE(pos_ * kBlockSize, file_size_);
     }
@@ -62,11 +65,6 @@ class TestMultiBufferDataProvider : public media::MultiBuffer::DataProvider {
     return ret;
   }
 
-  void SetAvailableCallback(const base::Closure& cb) override {
-    DCHECK(!Available());
-    cb_ = cb;
-  }
-
   void SetDeferred(bool deferred) override {
     if (deferred) {
       if (max_blocks_after_defer_ > 0) {
@@ -102,7 +100,7 @@ class TestMultiBufferDataProvider : public media::MultiBuffer::DataProvider {
       fifo_.push_back(DataBuffer::CreateEOSBuffer());
       ret = false;
     }
-    cb_.Run();
+    multibuffer_->DataProviderEvent(this);
     return ret;
   }
 
@@ -113,7 +111,7 @@ class TestMultiBufferDataProvider : public media::MultiBuffer::DataProvider {
   int32_t max_blocks_after_defer_;
   size_t file_size_;
   bool must_read_whole_file_;
-  base::Closure cb_;
+  MultiBuffer* multibuffer_;
 };
 
 class TestMultiBuffer : public media::MultiBuffer {
@@ -184,8 +182,8 @@ class TestMultiBuffer : public media::MultiBuffer {
     DCHECK(create_ok_);
     writers_created_++;
     CHECK_LT(writers.size(), max_writers_);
-    return new TestMultiBufferDataProvider(
-        pos, file_size_, max_blocks_after_defer_, must_read_whole_file_);
+    return new FakeMultiBufferDataProvider(
+        pos, file_size_, max_blocks_after_defer_, must_read_whole_file_, this);
   }
   void Prune(size_t max_to_free) override {
     // Prune should not cause additional writers to be spawned.
@@ -205,7 +203,8 @@ class TestMultiBuffer : public media::MultiBuffer {
   bool must_read_whole_file_;
   int32_t writers_created_;
 };
-}
+
+}  // namespace media
 
 class MultiBufferTest : public testing::Test {
  public: