Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer."

media/blink/buffered_data_source.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_data_source.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 250 matching lines @@
                                     !media_has_played_ && !IsStreaming()))) {
     loader_->CancelUponDeferral();
   }
 }
 
 int64_t BufferedDataSource::GetMemoryUsage() const {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   return loader_ ? loader_->GetMemoryUsage() : 0;
 }
 
+GURL BufferedDataSource::GetUrlAfterRedirects() const {
+  return response_original_url_;
+}
+
 void BufferedDataSource::Read(int64_t position,
                               int size,
                               uint8_t* data,
                               const DataSource::ReadCB& read_cb) {
   DVLOG(1) << "Read: " << position << " offset, " << size << " bytes";
   DCHECK(!read_cb.is_null());
 
   {
     base::AutoLock auto_lock(lock_);
     DCHECK(!read_op_);
@@ skipping 340 matching lines @@
   }
 
   // If media is currently playing or the page indicated preload=auto or the
   // the server does not support the byte range request or we do not want to go
   // too far ahead of the read head, use threshold strategy to enable/disable
   // deferring when the buffer is full/depleted.
   loader_->UpdateDeferStrategy(BufferedResourceLoader::kCapacityDefer);
 }
 
 }  // namespace media