Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

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

Issue 6580014: Make playback fail if redirected to a different origin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix spelling error Created 9 years, 10 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
« no previous file with comments | « webkit/glue/media/buffered_resource_loader.cc ('k') | webkit/glue/media/simple_data_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/media/buffered_resource_loader_unittest.cc
diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/glue/media/buffered_resource_loader_unittest.cc
index dc67edf1d16744a5f8c9d3bc2fc22aabd626ad9f..158b6dc36d336252129ef752abe3675a25c25dbb 100644
--- a/webkit/glue/media/buffered_resource_loader_unittest.cc
+++ b/webkit/glue/media/buffered_resource_loader_unittest.cc
@@ -526,28 +526,17 @@ TEST_F(BufferedResourceLoaderTest, HasSingleOrigin) {
// Test redirect to a different domain.
Initialize(kHttpUrl, -1, -1);
Start();
+ EXPECT_CALL(*this, StartCallback(net::ERR_ADDRESS_INVALID));
Redirect(kHttpRedirectToDifferentDomainUrl1);
- FullResponse(1024);
EXPECT_FALSE(loader_->HasSingleOrigin());
StopWhenLoad();
- // Test redirect twice to a different domain.
+ // Test redirect to the same domain and then to a different domain.
Initialize(kHttpUrl, -1, -1);
Start();
- Redirect(kHttpRedirectToDifferentDomainUrl1);
- Redirect(kHttpRedirectToDifferentDomainUrl2);
- FullResponse(1024);
- EXPECT_FALSE(loader_->HasSingleOrigin());
- StopWhenLoad();
-
- // 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.
- Initialize(kHttpUrl, -1, -1);
- Start();
- Redirect(kHttpRedirectToDifferentDomainUrl1);
Redirect(kHttpRedirectToSameDomainUrl1);
- FullResponse(1024);
+ EXPECT_CALL(*this, StartCallback(net::ERR_ADDRESS_INVALID));
+ Redirect(kHttpRedirectToDifferentDomainUrl1);
EXPECT_FALSE(loader_->HasSingleOrigin());
StopWhenLoad();
}
« no previous file with comments | « webkit/glue/media/buffered_resource_loader.cc ('k') | webkit/glue/media/simple_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698