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

media/blink/buffered_resource_loader.cc

 // 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.
 
 #include "media/blink/buffered_resource_loader.h"
 
 #include "base/bits.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 345 matching lines @@
 void BufferedResourceLoader::didReceiveResponse(
     WebURLLoader* loader,
     const WebURLResponse& response) {
   DVLOG(1) << "didReceiveResponse: HTTP/"
            << (response.httpVersion() == WebURLResponse::HTTP_0_9 ? "0.9" :
                response.httpVersion() == WebURLResponse::HTTP_1_0 ? "1.0" :
                response.httpVersion() == WebURLResponse::HTTP_1_1 ? "1.1" :
                "Unknown")
            << " " << response.httpStatusCode();
   DCHECK(active_loader_.get());
+  response_original_url_ = response.wasFetchedViaServiceWorker()
+                               ? response.originalURLViaServiceWorker()
+                               : response.url();
 
   // The loader may have been stopped and |start_cb| is destroyed.
   // In this case we shouldn't do anything.
   if (start_cb_.is_null())
     return;
 
   uint32 reasons = GetReasonsForUncacheability(response);
   might_be_reused_from_cache_in_future_ = reasons == 0;
   UMA_HISTOGRAM_BOOLEAN("Media.CacheUseful", reasons == 0);
   int shift = 0;
@@ skipping 428 matching lines @@
 
 void BufferedResourceLoader::Log() {
   media_log_->AddEvent(
       media_log_->CreateBufferedExtentsChangedEvent(
           offset_ - buffer_.backward_bytes(),
           offset_,
           offset_ + buffer_.forward_bytes()));
 }
 
 }  // namespace media