Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: content/browser/android/java/gin_java_bridge_dispatcher_host.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
Index: content/browser/android/java/gin_java_bridge_dispatcher_host.cc
diff --git a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
index 2de4f9fef0fb27a92251c5c0880c8b021f22214a..91c6107f037f60563ba17a6134bc3c54a229b6a2 100644
--- a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
+++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
@@ -6,6 +6,7 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
+#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "content/browser/android/java/gin_java_bound_object_delegate.h"
#include "content/browser/android/java/gin_java_bridge_message_filter.h"
@@ -334,14 +335,13 @@ void GinJavaBridgeDispatcherHost::OnInvokeMethod(
}
scoped_refptr<GinJavaMethodInvocationHelper> result =
new GinJavaMethodInvocationHelper(
- make_scoped_ptr(new GinJavaBoundObjectDelegate(object)),
- method_name,
+ base::WrapUnique(new GinJavaBoundObjectDelegate(object)), method_name,
arguments);
result->Init(this);
result->Invoke();
*error_code = result->GetInvocationError();
if (result->HoldsPrimitiveResult()) {
- scoped_ptr<base::ListValue> result_copy(
+ std::unique_ptr<base::ListValue> result_copy(
result->GetPrimitiveResult().DeepCopy());
wrapped_result->Swap(result_copy.get());
} else if (!result->GetObjectResult().is_null()) {

Powered by Google App Engine
This is Rietveld 408576698