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

Unified Diff: chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc

Issue 2811673002: Reland: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Workaround with std::move 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: chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
index e401e50be80bd6f78ee4fede6e79c8b21e5689e8..9cf5c20c80a2a5f166da97ca2c69bd9d4fcc1d65 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
@@ -5,10 +5,14 @@
#include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
#include <math.h> // For floor()
+
+#include <utility>
#include <vector>
+#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
#include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
#include "chrome/common/extensions/api/bookmarks.h"
#include "components/bookmarks/browser/bookmark_model.h"
@@ -151,14 +155,14 @@ void GetMetaInfo(const BookmarkNode& node,
return;
const BookmarkNode::MetaInfoMap* meta_info = node.GetMetaInfoMap();
- base::DictionaryValue* value = new base::DictionaryValue();
+ auto value = base::MakeUnique<base::DictionaryValue>();
if (meta_info) {
BookmarkNode::MetaInfoMap::const_iterator itr;
for (itr = meta_info->begin(); itr != meta_info->end(); ++itr) {
value->SetStringWithoutPathExpansion(itr->first, itr->second);
}
}
- id_to_meta_info_map->Set(base::Int64ToString(node.id()), value);
+ id_to_meta_info_map->Set(base::Int64ToString(node.id()), std::move(value));
if (node.is_folder()) {
for (int i = 0; i < node.child_count(); ++i) {

Powered by Google App Engine
This is Rietveld 408576698