Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

TBR=pneubeck@chromium.org,scottbyer@chromium.org
BUG=263894
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=215885

[Bernhard Bauer, 2013-07-31 08:19:10]

Please review.

Will: base/
Jochen: chrome/

Thanks!

[willchan no longer on Chromium, 2013-07-31 08:24:51]

Seems reasonable, but as I'm at IETF 87 right now, I'm going to redirect to
brettw@ for now.

[jochen (gone - plz use gerrit), 2013-07-31 13:42:03]

lgtm

[Bernhard Bauer, 2013-08-02 13:49:26]

On 2013/07/31 08:24:51, willchan wrote:
> Seems reasonable, but as I'm at IETF 87 right now, I'm going to redirect to
> brettw@ for now.

Brett, can you take a look please?

[brettw, 2013-08-05 23:58:58]

LGTM, thanks for cleaning this up.

[commit-bot: I haz the power, 2013-08-06 07:58:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/21030009/22001

[commit-bot: I haz the power, 2013-08-06 07:58:52]

Failed to apply patch for chrome/browser/policy/policy_loader_win.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/policy/policy_loader_win.cc
  Hunk #1 FAILED at 183.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/policy/policy_loader_win.cc.rej

Patch:       chrome/browser/policy/policy_loader_win.cc
Index: chrome/browser/policy/policy_loader_win.cc
diff --git a/chrome/browser/policy/policy_loader_win.cc
b/chrome/browser/policy/policy_loader_win.cc
index
e52a866f60b4fcadd37e84fa7e16b4a367921f16..191add8a5ca9b7f75b3289586f74e01340ab3f02
100644
--- a/chrome/browser/policy/policy_loader_win.cc
+++ b/chrome/browser/policy/policy_loader_win.cc
@@ -183,11 +183,11 @@ const base::DictionaryValue* GetEntry(const
base::DictionaryValue* dictionary,
 // Tries to extract the dictionary at |key| in |dict| and returns it.
 scoped_ptr<base::DictionaryValue> RemoveDict(base::DictionaryValue* dict,
                                              const std::string& key) {
-  base::Value* entry = NULL;
+  scoped_ptr<base::Value> entry;
   base::DictionaryValue* result_dict = NULL;
-  if (dict && dict->RemoveWithoutPathExpansion(key, &entry) && entry) {
-    if (!entry->GetAsDictionary(&result_dict))
-      delete entry;
+  if (dict && dict->RemoveWithoutPathExpansion(key, &entry) && entry &&
+      entry->GetAsDictionary(&result_dict)) {
+    ignore_result(entry.release());
   }
 
   return make_scoped_ptr(result_dict);

[commit-bot: I haz the power, 2013-08-06 12:04:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/21030009/34001

[commit-bot: I haz the power, 2013-08-06 12:18:52]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[Bernhard Bauer, 2013-08-06 12:30:48]

TBR: Philipp for ONC, Scott for Cloud Print.

[commit-bot: I haz the power, 2013-08-06 12:31:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/21030009/34001

[pneubeck (no reviews), 2013-08-06 13:00:45]

lgtm

[commit-bot: I haz the power, 2013-08-06 13:33:08]

Change committed as 215885