Use maximum capacity instead of a ratio of capacity for BufferedResourceLoader.

webkit/media/buffered_resource_loader_unittest.cc

Index: webkit/media/buffered_resource_loader_unittest.cc
diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc
index 541c5a8c1cb8d5a8755de1dd376730c64ebc0005..2aac94e6173ec4a8f21d7c44d38b648fb2013c46 100644
--- a/webkit/media/buffered_resource_loader_unittest.cc
+++ b/webkit/media/buffered_resource_loader_unittest.cc
@@ -667,7 +667,7 @@ TEST_F(BufferedResourceLoaderTest, ReadThenDeferStrategy) {
   StopWhenLoad();
 }
 
-// Tests the data buffering logic of ThresholdDefer strategy.
+// Tests the data buffering logic of kThresholdDefer strategy.
 TEST_F(BufferedResourceLoaderTest, ThresholdDeferStrategy) {
   Initialize(kHttpUrl, 10, 99);
   SetLoaderBuffer(10, 20);
@@ -680,36 +680,26 @@ TEST_F(BufferedResourceLoaderTest, ThresholdDeferStrategy) {
   // Initial expectation: we're not deferring.
   ConfirmLoaderDeferredState(false);
 
-  // Write half of threshold: keep not deferring.
+  // Write half of capacity: keep not deferring.
   WriteData(5);
   ConfirmLoaderDeferredState(false);
 
-  // Write rest of space until threshold: start deferring.
+  // Write rest of space until capacity: start deferring.
   EXPECT_CALL(*this, NetworkCallback());
   WriteData(5);
   ConfirmLoaderDeferredState(true);
 
-  // Read a little from the buffer: keep deferring.
+  // Read a byte from the buffer: stop deferring.
   EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 1));
-  ReadLoader(10, 1, buffer);
-  ConfirmLoaderDeferredState(true);
-
-  // Read a little more and go under threshold: stop deferring.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 4));
   EXPECT_CALL(*this, NetworkCallback());
-  ReadLoader(12, 4, buffer);
+  ReadLoader(10, 1, buffer);
   ConfirmLoaderDeferredState(false);
 
-  // Write rest of space until threshold: start deferring.
+  // Write a byte to hit capacity: start deferring.
   EXPECT_CALL(*this, NetworkCallback());
   WriteData(6);
   ConfirmLoaderDeferredState(true);
 
-  // Read a little from the buffer: keep deferring.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 1));
-  ReadLoader(16, 1, buffer);
-  ConfirmLoaderDeferredState(true);
-
   StopWhenLoad();
 }
 
@@ -725,10 +715,11 @@ TEST_F(BufferedResourceLoaderTest, Tricky_ReadForwardsPastBuffered) {
   // PRECONDITION
   WriteUntilThreshold();
   EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 1));
+  EXPECT_CALL(*this, NetworkCallback());
   ReadLoader(10, 1, buffer);
   ConfirmBufferState(1, 10, 9, 10);
   ConfirmLoaderOffsets(11, 0, 0);
-  ConfirmLoaderDeferredState(true);
+  ConfirmLoaderDeferredState(false);
 
   // *** TRICKY BUSINESS, PT. I ***
   // Read past buffered: stop deferring.
@@ -742,7 +733,6 @@ TEST_F(BufferedResourceLoaderTest, Tricky_ReadForwardsPastBuffered) {
   // AFTER
   //   offset=24 [__________]
   //
-  EXPECT_CALL(*this, NetworkCallback());
   ReadLoader(20, 4, buffer);
   ConfirmLoaderDeferredState(false);
 
@@ -814,7 +804,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_SmallReadWithinThreshold) {
   ConfirmLoaderDeferredState(true);
 
   // *** TRICKY BUSINESS, PT. III ***
-  // Read past forward capacity but within threshold: stop deferring.
+  // Read past forward capacity but within capacity: stop deferring.
   //
   // In order for the read to complete we must:
   //   1) Adjust offset forward to create capacity.
@@ -868,7 +858,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_LargeReadWithinThreshold) {
 
   // *** TRICKY BUSINESS, PT. IV ***
   // Read a large amount past forward capacity but within
-  // threshold: stop deferring.
+  // capacity: stop deferring.
   //
   // In order for the read to complete we must:
   //   1) Adjust offset forward to create capacity.