Use std::unique_ptr for base::DictionaryValue and base::ListValue's internal store.

content/browser/android/java/gin_java_method_invocation_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/java/gin_java_method_invocation_helper.h"
 
 #include <unistd.h>
 #include <cmath>
 #include <utility>
 
@@ skipping 26 matching lines @@
       method_name_(method_name),
       arguments_(arguments.DeepCopy()),
       invocation_error_(kGinJavaBridgeNoError) {}
 
 GinJavaMethodInvocationHelper::~GinJavaMethodInvocationHelper() {}
 
 void GinJavaMethodInvocationHelper::Init(DispatcherDelegate* dispatcher) {
   // Build on the UI thread a map of object_id -> WeakRef for Java objects from
   // |arguments_|.  Then we can use this map on the background thread without
   // accessing |dispatcher|.
-  BuildObjectRefsFromListValue(dispatcher, arguments_.get());
+  BuildObjectRefsFromListValue(dispatcher, *arguments_);
 }
 
 // As V8ValueConverter has finite recursion depth when serializing
 // JavaScript values, we don't bother about having a recursion threshold here.
 void GinJavaMethodInvocationHelper::BuildObjectRefsFromListValue(
     DispatcherDelegate* dispatcher,
-    const base::Value* list_value) {
-  DCHECK(list_value->IsType(base::Value::TYPE_LIST));
+    const base::Value& list_value) {
+  DCHECK(list_value.IsType(base::Value::TYPE_LIST));
   const base::ListValue* list;
-  list_value->GetAsList(&list);
-  for (base::ListValue::const_iterator iter = list->begin();
-       iter != list->end();
-       ++iter) {
-    if (AppendObjectRef(dispatcher, *iter))
+  list_value.GetAsList(&list);
+  for (const auto& entry : *list) {
+    if (AppendObjectRef(dispatcher, *entry))
       continue;
-    if ((*iter)->IsType(base::Value::TYPE_LIST)) {
-      BuildObjectRefsFromListValue(dispatcher, *iter);
-    } else if ((*iter)->IsType(base::Value::TYPE_DICTIONARY)) {
-      BuildObjectRefsFromDictionaryValue(dispatcher, *iter);
+    if (entry->IsType(base::Value::TYPE_LIST)) {
+      BuildObjectRefsFromListValue(dispatcher, *entry);
+    } else if (entry->IsType(base::Value::TYPE_DICTIONARY)) {
+      BuildObjectRefsFromDictionaryValue(dispatcher, *entry);
     }
   }
 }
 
 void GinJavaMethodInvocationHelper::BuildObjectRefsFromDictionaryValue(
     DispatcherDelegate* dispatcher,
-    const base::Value* dict_value) {
-  DCHECK(dict_value->IsType(base::Value::TYPE_DICTIONARY));
+    const base::Value& dict_value) {
+  DCHECK(dict_value.IsType(base::Value::TYPE_DICTIONARY));
   const base::DictionaryValue* dict;
-  dict_value->GetAsDictionary(&dict);
+  dict_value.GetAsDictionary(&dict);
   for (base::DictionaryValue::Iterator iter(*dict);
        !iter.IsAtEnd();
        iter.Advance()) {
-    if (AppendObjectRef(dispatcher, &iter.value()))
+    if (AppendObjectRef(dispatcher, iter.value()))
       continue;
     if (iter.value().IsType(base::Value::TYPE_LIST)) {
-      BuildObjectRefsFromListValue(dispatcher, &iter.value());
+      BuildObjectRefsFromListValue(dispatcher, iter.value());
     } else if (iter.value().IsType(base::Value::TYPE_DICTIONARY)) {
-      BuildObjectRefsFromDictionaryValue(dispatcher, &iter.value());
+      BuildObjectRefsFromDictionaryValue(dispatcher, iter.value());
     }
   }
 }
 
 bool GinJavaMethodInvocationHelper::AppendObjectRef(
     DispatcherDelegate* dispatcher,
-    const base::Value* raw_value) {
-  if (!GinJavaBridgeValue::ContainsGinJavaBridgeValue(raw_value))
+    const base::Value& raw_value) {
+  if (!GinJavaBridgeValue::ContainsGinJavaBridgeValue(&raw_value))
     return false;
   std::unique_ptr<const GinJavaBridgeValue> value(
-      GinJavaBridgeValue::FromValue(raw_value));
+      GinJavaBridgeValue::FromValue(&raw_value));
   if (!value->IsType(GinJavaBridgeValue::TYPE_OBJECT_ID))
     return false;
   GinJavaBoundObject::ObjectID object_id;
   if (value->GetAsObjectID(&object_id)) {
     ObjectRefs::iterator iter = object_refs_.find(object_id);
     if (iter == object_refs_.end()) {
       JavaObjectWeakGlobalRef object_ref(
           dispatcher->GetObjectWeakRef(object_id));
       if (!object_ref.is_empty()) {
         object_refs_.insert(std::make_pair(object_id, object_ref));
@@ skipping 229 matching lines @@
   }
   // This is for all cases except JavaType::TypeObject.
   if (!base::android::ClearException(env)) {
     SetPrimitiveResult(result_wrapper);
   } else {
     SetInvocationError(kGinJavaBridgeJavaExceptionRaised);
   }
 }
 
 }  // namespace content