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

media/blink/multibuffer_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/multibuffer_data_source.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 310 matching lines @@
       reader_.reset(nullptr);
   }
 }
 
 int64_t MultibufferDataSource::GetMemoryUsage() const {
   // TODO(hubbe): Make more accurate when url_data_ is shared.
   return url_data_->CachedSize()
          << url_data_->multibuffer()->block_size_shift();
 }
 
+GURL MultibufferDataSource::GetUrlAfterRedirects() const {
+  return url_data_->url();
+}
+
 void MultibufferDataSource::Read(int64_t position,
                                  int size,
                                  uint8_t* data,
                                  const DataSource::ReadCB& read_cb) {
   DVLOG(1) << "Read: " << position << " offset, " << size << " bytes";
   // Reading is not allowed until after initialization.
   DCHECK(init_cb_.is_null());
   DCHECK(!read_cb.is_null());
 
   {
@@ skipping 250 matching lines @@
   reader_->SetPinRange(back_buffer, kMaxBufferPreload + kPreloadHighExtra);
 
   if (preload_ == METADATA) {
     reader_->SetPreload(0, 0);
   } else {
     reader_->SetPreload(preload_high, preload);
   }
 }
 
 }  // namespace media