Make playback fail if redirected to a different origin.

webkit/glue/media/simple_data_source_unittest.cc

Index: webkit/glue/media/simple_data_source_unittest.cc
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index a9a70a47b7a8bd06e693344a774da97a5be5fe96..5206b8b5ad895065bd370ab40c02a83d0c17163b 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 redirct to the same domain and then to a different domain.

[scherkus (not reviewing), 2011/02/25 01:40:54]

redirct -> redirect

[acolwell GONE FROM CHROMIUM, 2011/02/25 17:45:02]

Done.

   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();
 }