webkit/glue/media/buffered_data_source_unittest.cc - Issue 6815012: Only make Range requests when the desired range doesn't cover the whole file.

Unified Diff: webkit/glue/media/buffered_data_source_unittest.cc

Issue 6815012: Only make Range requests when the desired range doesn't cover the whole file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit tests Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webkit/glue/media/buffered_data_source.cc ('K') | « webkit/glue/media/buffered_data_source.cc ('k') | webkit/glue/media/buffered_resource_loader.h » ('j') | webkit/glue/media/buffered_resource_loader.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/glue/media/buffered_data_source_unittest.cc

diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc

index dd5c891bf92728975fcead88b1c7a9dbc3de12e5..9d63f4c3ff2c421db000c343edbd51a635a61407 100644

--- a/webkit/glue/media/buffered_data_source_unittest.cc

+++ b/webkit/glue/media/buffered_data_source_unittest.cc

@@ -76,7 +76,7 @@ class MockBufferedResourceLoader : public BufferedResourceLoader {

net::CompletionCallback* callback));

MOCK_METHOD0(content_length, int64());

MOCK_METHOD0(instance_size, int64());

- MOCK_METHOD0(partial_response, bool());

+ MOCK_METHOD0(range_supported, bool());

MOCK_METHOD0(network_activity, bool());

MOCK_METHOD0(url, const GURL&());

MOCK_METHOD0(GetBufferedFirstBytePosition, int64());

@@ -164,8 +164,11 @@ class BufferedDataSourceTest : public testing::Test {

ON_CALL(*loader_, instance_size())

.WillByDefault(Return(instance_size));

- ON_CALL(*loader_, partial_response())

+ // range_supported() return true if we expect to get a partial response.

+ ON_CALL(*loader_, range_supported())

Ami GONE FROM CHROMIUM 2011/04/08 03:02:10 Is there a test here for the case of a lying serve

acolwell GONE FROM CHROMIUM 2011/04/18 22:09:56 Done. Added ServerLiesAboutRangeSupport test to si

.WillByDefault(Return(partial_response));

ON_CALL(*loader_, url())

.WillByDefault(ReturnRef(gurl_));

media::PipelineStatus expected_init_status = media::PIPELINE_OK;

@@ -301,8 +304,8 @@ class BufferedDataSourceTest : public testing::Test {

.WillOnce(DoAll(Assign(&error_, net::OK),

Invoke(this,

&BufferedDataSourceTest::InvokeStartCallback)));

- EXPECT_CALL(*new_loader, partial_response())

- .WillRepeatedly(Return(loader_->partial_response()));

+ EXPECT_CALL(*new_loader, range_supported())

+ .WillRepeatedly(Return(loader_->range_supported()));

// 4. Then again a read request is made to the new loader.

EXPECT_CALL(*new_loader, Read(position, size, NotNull(), NotNull()))

@@ -367,8 +370,8 @@ class BufferedDataSourceTest : public testing::Test {