[Merge to M45]Check the response URL origin in BufferedDataSource to avoid mixing cross-origin resp…

media/blink/buffered_resource_loader.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_
 #define MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 187 matching lines @@
       const std::string& content_range_str, int64* first_byte_position,
       int64* last_byte_position, int64* instance_size);
 
   // Cancels and closes any outstanding deferred ActiveLoader instances. Does
   // not report a failed state, so subsequent read calls to cache may still
   // complete okay. If the ActiveLoader is not deferred it will be canceled once
   // it is unless playback starts before then (as determined by the reported
   // playback rate).
   void CancelUponDeferral();
 
+  // Returns the original URL of the response. If the request is redirected to
+  // another URL it is the URL after redirected. If the response is generated in
+  // a Service Worker it is empty.
+  const GURL response_original_url() const { return response_original_url_; }
+
  private:
   friend class BufferedDataSourceTest;
   friend class BufferedResourceLoaderTest;
   friend class MockBufferedDataSource;
 
   // Updates the |buffer_|'s forward and backward capacities.
   void UpdateBufferWindow();
 
   // Updates deferring behavior based on current buffering scheme.
   void UpdateDeferBehavior();
@@ skipping 91 matching lines @@
 
   // Injected WebURLLoader instance for testing purposes.
   scoped_ptr<blink::WebURLLoader> test_loader_;
 
   // Bitrate of the media. Set to 0 if unknown.
   int bitrate_;
 
   // Playback rate of the media.
   double playback_rate_;
 
+  GURL response_original_url_;
+
   scoped_refptr<MediaLog> media_log_;
 
   bool cancel_upon_deferral_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedResourceLoader);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_