summaryrefslogtreecommitdiffstats
path: root/webkit/media/buffered_data_source_unittest.cc
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 20:57:26 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 20:57:26 +0000
commit44d5a60484fbd580f92950297a4570eeadf19356 (patch)
tree1136abe9e378a01a056d5a92b57a0ea7f93e1719 /webkit/media/buffered_data_source_unittest.cc
parent193b39d2ef3ec7a4f1692fd4448c515c06bb46d1 (diff)
downloadchromium_src-44d5a60484fbd580f92950297a4570eeadf19356.zip
chromium_src-44d5a60484fbd580f92950297a4570eeadf19356.tar.gz
chromium_src-44d5a60484fbd580f92950297a4570eeadf19356.tar.bz2
Don't trigger second request on missing instance size in Content-Range.
Previously we were relying on the parser for multipart/x-mixed-replace to parse Content-Range. This CL instead introduces a parser that implements HTTP/1.1 (allowing instance-size to be "*"). BUG=104795 Review URL: http://codereview.chromium.org/9703073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/buffered_data_source_unittest.cc')
-rw-r--r--webkit/media/buffered_data_source_unittest.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc
index b153bb2..982e47b 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -198,6 +198,19 @@ TEST_F(BufferedDataSourceTest, Range_Supported) {
Respond(response_generator_.Generate206(0));
EXPECT_TRUE(data_source_->loading());
+ EXPECT_FALSE(data_source_->IsStreaming());
+ Stop();
+}
+
+TEST_F(BufferedDataSourceTest, Range_InstanceSizeUnknown) {
+ Initialize(media::PIPELINE_OK);
+
+ EXPECT_CALL(host_, SetBufferedBytes(0));
+ Respond(response_generator_.Generate206(
+ 0, TestResponseGenerator::kNoContentRangeInstanceSize));
+
+ EXPECT_TRUE(data_source_->loading());
+ EXPECT_TRUE(data_source_->IsStreaming());
Stop();
}
@@ -255,6 +268,7 @@ TEST_F(BufferedDataSourceTest, Range_MissingContentLength) {
0, TestResponseGenerator::kNoContentLength));
EXPECT_TRUE(data_source_->loading());
+ EXPECT_FALSE(data_source_->IsStreaming());
Stop();
}