Merge M47: "Add event to media log if origin changes during playback"

media/blink/buffered_data_source.cc

Index: media/blink/buffered_data_source.cc
diff --git a/media/blink/buffered_data_source.cc b/media/blink/buffered_data_source.cc
index 0fc16175ff4ec782c1766ab206ec2b52416b62a2..0aa85613c4907079308723957840fff36c3a1eb3 100644
--- a/media/blink/buffered_data_source.cc
+++ b/media/blink/buffered_data_source.cc
@@ -432,9 +432,14 @@ bool BufferedDataSource::CheckPartialResponseURL(
   // for details.
   // If the origin of the new response is different from the first response we
   // deny the redirected response unless the crossorigin attribute has been set.
-  return (response_original_url_.GetOrigin() ==
-          partial_response_original_url.GetOrigin()) ||
-         DidPassCORSAccessCheck();
+  if ((response_original_url_.GetOrigin() ==
+       partial_response_original_url.GetOrigin()) ||
+      DidPassCORSAccessCheck()) {
+    return true;
+  }
+
+  MEDIA_LOG(ERROR, media_log_) << "BufferedDataSource: origin has changed";
+  return false;
 }
 
 void BufferedDataSource::ReadCallback(