Commit 477a4b0a authored by Alok Priyadarshi's avatar Alok Priyadarshi Committed by Commit Bot

Removes ununsed member variable MultibufferDataSource::frame_.

Change-Id: I0f40eb26f3f74cf3effc08aa37dff5caff407e61
Reviewed-on: https://chromium-review.googlesource.com/580671
Commit-Queue: Alok Priyadarshi <alokp@chromium.org>
Reviewed-by: default avatarFredrik Hubinette <hubbe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488767}
parent 6d891f6e
......@@ -17,8 +17,6 @@
#include "media/blink/multibuffer_reader.h"
#include "net/base/net_errors.h"
using blink::WebFrame;
namespace {
// Minimum preload buffer.
......@@ -108,7 +106,6 @@ MultibufferDataSource::MultibufferDataSource(
UrlData::CORSMode cors_mode,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
linked_ptr<UrlIndex> url_index,
WebFrame* frame,
MediaLog* media_log,
BufferedDataSourceHost* host,
const DownloadingCB& downloading_cb)
......@@ -119,7 +116,6 @@ MultibufferDataSource::MultibufferDataSource(
failed_(false),
render_task_runner_(task_runner),
url_index_(url_index),
frame_(frame),
stop_signal_received_(false),
media_has_played_(false),
single_origin_(true),
......
......@@ -61,7 +61,6 @@ class MEDIA_BLINK_EXPORT MultibufferDataSource : public DataSource {
UrlData::CORSMode cors_mode,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
linked_ptr<UrlIndex> url_index,
blink::WebFrame* frame,
MediaLog* media_log,
BufferedDataSourceHost* host,
const DownloadingCB& downloading_cb);
......@@ -190,9 +189,6 @@ class MEDIA_BLINK_EXPORT MultibufferDataSource : public DataSource {
// Shared cache.
linked_ptr<UrlIndex> url_index_;
// A webframe for loading.
blink::WebFrame* frame_;
// A resource reader for the media resource.
std::unique_ptr<MultiBufferReader> reader_;
......
......@@ -187,14 +187,12 @@ class MockMultibufferDataSource : public MultibufferDataSource {
UrlData::CORSMode cors_mode,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
linked_ptr<UrlIndex> url_index,
WebLocalFrame* frame,
BufferedDataSourceHost* host)
: MultibufferDataSource(
url,
cors_mode,
task_runner,
url_index,
frame,
&media_log_,
host,
base::Bind(&MockMultibufferDataSource::set_downloading,
......@@ -242,8 +240,7 @@ class MultibufferDataSourceTest : public testing::Test {
size_t file_size = kFileSize) {
GURL gurl(url);
data_source_.reset(new MockMultibufferDataSource(
gurl, cors_mode, message_loop_.task_runner(), url_index_,
view_->MainFrame()->ToWebLocalFrame(), &host_));
gurl, cors_mode, message_loop_.task_runner(), url_index_, &host_));
data_source_->SetPreload(preload_);
response_generator_.reset(new TestResponseGenerator(gurl, file_size));
......@@ -1019,9 +1016,9 @@ TEST_F(MultibufferDataSourceTest, Http_ShareData) {
EXPECT_TRUE(data_source_->downloading());
StrictMock<MockBufferedDataSourceHost> host2;
MockMultibufferDataSource source2(
GURL(kHttpUrl), UrlData::CORS_UNSPECIFIED, message_loop_.task_runner(),
url_index_, view_->MainFrame()->ToWebLocalFrame(), &host2);
MockMultibufferDataSource source2(GURL(kHttpUrl), UrlData::CORS_UNSPECIFIED,
message_loop_.task_runner(), url_index_,
&host2);
source2.SetPreload(preload_);
EXPECT_CALL(*this, OnInitialize(true));
......@@ -1313,7 +1310,7 @@ TEST_F(MultibufferDataSourceTest, SeekPastEOF) {
GURL gurl(kHttpUrl);
data_source_.reset(new MockMultibufferDataSource(
gurl, UrlData::CORS_UNSPECIFIED, message_loop_.task_runner(), url_index_,
view_->MainFrame()->ToWebLocalFrame(), &host_));
&host_));
data_source_->SetPreload(preload_);
response_generator_.reset(new TestResponseGenerator(gurl, kDataSize + 1));
......@@ -1594,7 +1591,7 @@ TEST_F(MultibufferDataSourceTest, Http_CheckLoadingTransition) {
GURL gurl(kHttpUrl);
data_source_.reset(new MockMultibufferDataSource(
gurl, UrlData::CORS_UNSPECIFIED, message_loop_.task_runner(), url_index_,
view_->MainFrame()->ToWebLocalFrame(), &host_));
&host_));
data_source_->SetPreload(preload_);
response_generator_.reset(new TestResponseGenerator(gurl, kDataSize * 1));
......
......@@ -511,7 +511,7 @@ void WebMediaPlayerImpl::DoLoad(LoadType load_type,
} else {
data_source_.reset(new MultibufferDataSource(
url, static_cast<UrlData::CORSMode>(cors_mode), main_task_runner_,
url_index_, frame_, media_log_.get(), &buffered_data_source_host_,
url_index_, media_log_.get(), &buffered_data_source_host_,
base::Bind(&WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr())));
data_source_->SetPreload(preload_);
data_source_->Initialize(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment