content/browser/android/java/gin_java_method_invocation_helper.cc - Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr

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/browser/android/java/gin_java_method_invocation_helper.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months 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/browser/android/java/gin_java_method_invocation_helper.h ('k') | content/browser/android/java/gin_java_method_invocation_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/java/gin_java_method_invocation_helper.cc

diff --git a/content/browser/android/java/gin_java_method_invocation_helper.cc b/content/browser/android/java/gin_java_method_invocation_helper.cc

index 904926f6fbea9cb150d29fe7ffdaba63f3364396..78100575452faed38fececdd89e9c4fab2ce46a8 100644

--- a/content/browser/android/java/gin_java_method_invocation_helper.cc

+++ b/content/browser/android/java/gin_java_method_invocation_helper.cc

@@ -30,7 +30,7 @@ const int kObjectGetClassInvocationAttemptLogTag = 70151;

} // namespace

GinJavaMethodInvocationHelper::GinJavaMethodInvocationHelper(

- scoped_ptr<ObjectDelegate> object,

+ std::unique_ptr<ObjectDelegate> object,

const std::string& method_name,

const base::ListValue& arguments)

: object_(std::move(object)),

@@ -92,7 +92,7 @@ bool GinJavaMethodInvocationHelper::AppendObjectRef(

const base::Value* raw_value) {

if (!GinJavaBridgeValue::ContainsGinJavaBridgeValue(raw_value))

return false;

- scoped_ptr<const GinJavaBridgeValue> value(

+ std::unique_ptr<const GinJavaBridgeValue> value(

GinJavaBridgeValue::FromValue(raw_value));

if (!value->IsType(GinJavaBridgeValue::TYPE_OBJECT_ID))

return false;