summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media/simple_data_source_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/media/simple_data_source_unittest.cc')
-rw-r--r--webkit/glue/media/simple_data_source_unittest.cc18
1 files changed, 4 insertions, 14 deletions
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index a9a70a4..125fd33 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/glue/media/simple_data_source_unittest.cc
@@ -254,26 +254,16 @@ TEST_F(SimpleDataSourceTest, HasSingleOrigin) {
// Test redirect to a different domain.
InitializeDataSource(kHttpUrl, media::NewExpectedCallback());
+ EXPECT_CALL(host_, SetError(media::PIPELINE_ERROR_NETWORK));
Redirect(kHttpRedirectToDifferentDomainUrl1);
- RequestSucceeded(false);
- EXPECT_FALSE(data_source_->HasSingleOrigin());
- DestroyDataSource();
-
- // Test redirect twice to a different domain.
- InitializeDataSource(kHttpUrl, media::NewExpectedCallback());
- Redirect(kHttpRedirectToDifferentDomainUrl1);
- Redirect(kHttpRedirectToDifferentDomainUrl2);
- RequestSucceeded(false);
EXPECT_FALSE(data_source_->HasSingleOrigin());
DestroyDataSource();
- // Test to a different domain and then back to the same domain.
- // NOTE: A different origin was encountered at least once so that
- // makes HasSingleOrigin() become false.
+ // Test redirect to the same domain and then to a different domain.
InitializeDataSource(kHttpUrl, media::NewExpectedCallback());
- Redirect(kHttpRedirectToDifferentDomainUrl1);
Redirect(kHttpRedirectToSameDomainUrl1);
- RequestSucceeded(false);
+ EXPECT_CALL(host_, SetError(media::PIPELINE_ERROR_NETWORK));
+ Redirect(kHttpRedirectToDifferentDomainUrl1);
EXPECT_FALSE(data_source_->HasSingleOrigin());
DestroyDataSource();
}