Introduce CancelUponDeferral() to buffered media loaders.

media/blink/buffered_resource_loader_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 <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 264 matching lines @@
     static const int kMinBufferCapacity = 2 * 1024 * 1024;
     EXPECT_GE(loader_->buffer_.forward_capacity(), kMinBufferCapacity);
     EXPECT_GE(loader_->buffer_.backward_capacity(), kMinBufferCapacity);
 
     // Corresponds to value defined in buffered_resource_loader.cc.
     static const int kMaxBufferCapacity = 20 * 1024 * 1024;
     EXPECT_LE(loader_->buffer_.forward_capacity(), kMaxBufferCapacity);
     EXPECT_LE(loader_->buffer_.backward_capacity(), kMaxBufferCapacity);
   }
 
+  bool HasActiveLoader() { return loader_->active_loader_; }
+
   MOCK_METHOD1(StartCallback, void(BufferedResourceLoader::Status));
   MOCK_METHOD2(ReadCallback, void(BufferedResourceLoader::Status, int));
   MOCK_METHOD1(LoadingCallback, void(BufferedResourceLoader::LoadingState));
   MOCK_METHOD1(ProgressCallback, void(int64));
 
  protected:
   GURL gurl_;
   int64 first_position_;
   int64 last_position_;
 
@@ skipping 826 matching lines @@
   ExpectContentRangeFailure("bytes -300/400");
   ExpectContentRangeFailure("bytes 20-10/400");
 
   ExpectContentRangeSuccess("bytes 0-499/500", 0, 499, 500);
   ExpectContentRangeSuccess("bytes 0-0/500", 0, 0, 500);
   ExpectContentRangeSuccess("bytes 10-11/50", 10, 11, 50);
   ExpectContentRangeSuccess("bytes 10-11/*", 10, 11,
                             kPositionNotSpecified);
 }
 
+// Tests the data buffering logic of ReadThenDefer strategy.
+TEST_F(BufferedResourceLoaderTest, CancelAfterDeferral) {
+  Initialize(kHttpUrl, 10, 99);
+  SetLoaderBuffer(10, 20);
+  loader_->UpdateDeferStrategy(BufferedResourceLoader::kReadThenDefer);
+  loader_->CancelUponDeferral();
+  Start();
+  PartialResponse(10, 99, 100);
+
+  uint8 buffer[10];
+
+  // Make an outstanding read request.
+  ReadLoader(10, 10, buffer);
+
+  // Receive almost enough data to cover, shouldn't defer.
+  WriteLoader(10, 9);
+  EXPECT_TRUE(HasActiveLoader());
+
+  // As soon as we have received enough data to fulfill the read, defer.
+  EXPECT_CALL(*this, LoadingCallback(BufferedResourceLoader::kLoadingDeferred));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
+  WriteLoader(19, 1);
+  VerifyBuffer(buffer, 10, 10);
+  EXPECT_FALSE(HasActiveLoader());
+}
+
 }  // namespace media