Remove more usage of the base::ListValue::Append(Value*) overload.

content/browser/webrtc/webrtc_internals.cc

Index: content/browser/webrtc/webrtc_internals.cc
diff --git a/content/browser/webrtc/webrtc_internals.cc b/content/browser/webrtc/webrtc_internals.cc
index b2dd5f8ce48a240ccd67a2d16df5da34e390ac00..90df08b6e105fe74647e17fe52e73008f71a1f47 100644
--- a/content/browser/webrtc/webrtc_internals.cc
+++ b/content/browser/webrtc/webrtc_internals.cc
@@ -6,6 +6,9 @@
 
 #include <stddef.h>
 
+#include <memory>
+#include <utility>
+
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
@@ -117,19 +120,20 @@ void WebRTCInternals::OnAddPeerConnection(int render_process_id,
                                           const string& constraints) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  base::DictionaryValue* dict = new base::DictionaryValue();
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("rid", render_process_id);
   dict->SetInteger("pid", static_cast<int>(pid));
   dict->SetInteger("lid", lid);
   dict->SetString("rtcConfiguration", rtc_configuration);
   dict->SetString("constraints", constraints);
   dict->SetString("url", url);
-  peer_connection_data_.Append(dict);
-  CreateOrReleasePowerSaveBlocker();
 
   if (observers_.might_have_observers())
     SendUpdate("addPeerConnection", dict->CreateDeepCopy());
 
+  peer_connection_data_.Append(std::move(dict));

[dcheng, 2016/08/30 06:47:48]

I reordered this, but I'm happy to fix this another way as well. The observer
call is just queues some JS to execute, so I figure this is fine.

(Alternately, we /could/ use WrapUnique but it's nice to avoid it when possible.
We could just always call CreateDeepCopy when adding it to the connection data,
but that seems "wasteful")

[danakj, 2016/09/06 21:55:39]

Hm.. or just save a raw pointer before doing the move. I'm not so sure about
reordering, as I don't know what contracts would be expected from these APIs. I
think you should either preserve ordering or get a review from owners who know
best here.

[dcheng, 2016/09/06 22:01:17]

I'll ask a webrtc owner to review.

It seems pretty sketchy either way, and I think I'd prefer less use of raw
pointers over more.

+  CreateOrReleasePowerSaveBlocker();
+
   if (render_process_id_set_.insert(render_process_id).second) {
     RenderProcessHost* host = RenderProcessHost::FromID(render_process_id);
     if (host)
@@ -184,26 +188,27 @@ void WebRTCInternals::OnUpdatePeerConnection(
     if (!log)
       return;
 
-    base::DictionaryValue* log_entry = new base::DictionaryValue();
-    if (!log_entry)
-      return;
+    std::unique_ptr<base::DictionaryValue> log_entry(
+        new base::DictionaryValue());
 
     double epoch_time = base::Time::Now().ToJsTime();
     string time = base::DoubleToString(epoch_time);
     log_entry->SetString("time", time);
     log_entry->SetString("type", type);
     log_entry->SetString("value", value);
-    log->Append(log_entry);
 
     if (observers_.might_have_observers()) {
       std::unique_ptr<base::DictionaryValue> update(
           new base::DictionaryValue());
       update->SetInteger("pid", static_cast<int>(pid));
       update->SetInteger("lid", lid);
-      update->MergeDictionary(log_entry);
+      update->MergeDictionary(log_entry.get());
 
       SendUpdate("updatePeerConnection", std::move(update));
     }
+
+    log->Append(std::move(log_entry));
+
     return;
   }
 }
@@ -231,7 +236,7 @@ void WebRTCInternals::OnGetUserMedia(int rid,
                                      const std::string& video_constraints) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  base::DictionaryValue* dict = new base::DictionaryValue();
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("rid", rid);
   dict->SetInteger("pid", static_cast<int>(pid));
   dict->SetString("origin", origin);
@@ -240,7 +245,7 @@ void WebRTCInternals::OnGetUserMedia(int rid,
   if (video)
     dict->SetString("video", video_constraints);
 
-  get_user_media_requests_.Append(dict);
+  get_user_media_requests_.Append(std::move(dict));
 
   if (observers_.might_have_observers())
     SendUpdate("addGetUserMedia", dict->CreateDeepCopy());