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

Unified Diff: content/browser/android/java/gin_java_method_invocation_helper_unittest.cc

Issue 2811253004: Remove ListValue::Append(raw ptr) on Android (Closed)
Patch Set: Comments Created 3 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_method_invocation_helper_unittest.cc
diff --git a/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
index 113cee3546f23e6d1c9b1d67db4d49b6ff67c463..dfc96ff7c472b8930c654eb6c4a8ee230b5811dd 100644
--- a/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
+++ b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
@@ -6,8 +6,12 @@
#include <stddef.h>
+#include <utility>
+
#include "base/android/jni_android.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "base/values.h"
#include "content/browser/android/java/jni_helper.h"
#include "content/common/android/gin_java_bridge_value.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -124,25 +128,25 @@ TEST_F(GinJavaMethodInvocationHelperTest, RetrievalOfObjectsNoObjects) {
TEST_F(GinJavaMethodInvocationHelperTest, RetrievalOfObjectsHaveObjects) {
base::ListValue objects;
objects.AppendInteger(100);
- objects.Append(GinJavaBridgeValue::CreateObjectIDValue(1).release());
- base::ListValue* sub_list = new base::ListValue();
+ objects.Append(GinJavaBridgeValue::CreateObjectIDValue(1));
+ auto sub_list = base::MakeUnique<base::ListValue>();
sub_list->AppendInteger(200);
- sub_list->Append(GinJavaBridgeValue::CreateObjectIDValue(2).release());
- objects.Append(sub_list);
- base::DictionaryValue* sub_dict = new base::DictionaryValue();
+ sub_list->Append(GinJavaBridgeValue::CreateObjectIDValue(2));
+ objects.Append(std::move(sub_list));
+ auto sub_dict = base::MakeUnique<base::DictionaryValue>();
sub_dict->SetInteger("1", 300);
- sub_dict->Set("2", GinJavaBridgeValue::CreateObjectIDValue(3).release());
- objects.Append(sub_dict);
- base::ListValue* sub_list_with_dict = new base::ListValue();
- base::DictionaryValue* sub_sub_dict = new base::DictionaryValue();
- sub_sub_dict->Set("1", GinJavaBridgeValue::CreateObjectIDValue(4).release());
- sub_list_with_dict->Append(sub_sub_dict);
- objects.Append(sub_list_with_dict);
- base::DictionaryValue* sub_dict_with_list = new base::DictionaryValue();
- base::ListValue* sub_sub_list = new base::ListValue();
- sub_sub_list->Append(GinJavaBridgeValue::CreateObjectIDValue(5).release());
- sub_dict_with_list->Set("1", sub_sub_list);
- objects.Append(sub_dict_with_list);
+ sub_dict->Set("2", GinJavaBridgeValue::CreateObjectIDValue(3));
+ objects.Append(std::move(sub_dict));
+ auto sub_list_with_dict = base::MakeUnique<base::ListValue>();
+ auto sub_sub_dict = base::MakeUnique<base::DictionaryValue>();
+ sub_sub_dict->Set("1", GinJavaBridgeValue::CreateObjectIDValue(4));
+ sub_list_with_dict->Append(std::move(sub_sub_dict));
+ objects.Append(std::move(sub_list_with_dict));
+ auto sub_dict_with_list = base::MakeUnique<base::DictionaryValue>();
+ auto sub_sub_list = base::MakeUnique<base::ListValue>();
+ sub_sub_list->Append(GinJavaBridgeValue::CreateObjectIDValue(5));
+ sub_dict_with_list->Set("1", std::move(sub_sub_list));
+ objects.Append(std::move(sub_dict_with_list));
scoped_refptr<GinJavaMethodInvocationHelper> helper =
new GinJavaMethodInvocationHelper(

Powered by Google App Engine
This is Rietveld 408576698