content/renderer/media/android/media_info_loader.cc - Issue 1552733002: Convert Pass()→std::move() in //content (Android edition)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/android/media_info_loader.cc

Issue 1552733002: Convert Pass()→std::move() in //content (Android edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/java/gin_java_bridge_value_converter.cc ('k') | content/renderer/media/android/media_source_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/media_info_loader.cc

diff --git a/content/renderer/media/android/media_info_loader.cc b/content/renderer/media/android/media_info_loader.cc

index 434df6b820fc594a3a5a4d5b08678ac56f545c5f..cf1764a6d3aae28cd1893db5b6a7e2595b7545f0 100644

--- a/content/renderer/media/android/media_info_loader.cc

+++ b/content/renderer/media/android/media_info_loader.cc

@@ -4,6 +4,8 @@

#include "content/renderer/media/android/media_info_loader.h"

+#include <utility>

#include "base/bits.h"

#include "base/callback_helpers.h"

#include "base/metrics/histogram.h"

@@ -59,7 +61,7 @@ void MediaInfoLoader::Start(blink::WebFrame* frame) {

scoped_ptr<WebURLLoader> loader;

if (test_loader_) {

- loader = test_loader_.Pass();

+ loader = std::move(test_loader_);

} else {

WebURLLoaderOptions options;

if (cors_mode_ == blink::WebMediaPlayer::CORSModeUnspecified) {

@@ -83,7 +85,7 @@ void MediaInfoLoader::Start(blink::WebFrame* frame) {

// Start the resource loading.

loader->loadAsynchronously(request, this);

- active_loader_.reset(new media::ActiveLoader(loader.Pass()));

+ active_loader_.reset(new media::ActiveLoader(std::move(loader)));

}

/////////////////////////////////////////////////////////////////////////////