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

Unified Diff: chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/supervised_user/supervised_user_bookmarks_handler.cc
diff --git a/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc b/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc
index f5a438bbc96af432fc9efac84ecc33c97551c934..65fdd19052ea7635094cf9cc8da0bb1c1cf05e24 100644
--- a/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc
+++ b/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/supervised_user/supervised_user_bookmarks_handler.h"
#include <stddef.h>
+#include <utility>
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
@@ -152,7 +153,7 @@ scoped_ptr<base::ListValue> SupervisedUserBookmarksHandler::BuildTree() {
root_.reset(new base::ListValue);
AddFoldersToTree();
AddLinksToTree();
- return root_.Pass();
+ return std::move(root_);
}
void SupervisedUserBookmarksHandler::AddFoldersToTree() {
@@ -171,7 +172,7 @@ void SupervisedUserBookmarksHandler::AddFoldersToTree() {
node->SetIntegerWithoutPathExpansion(kId, folder.id);
node->SetStringWithoutPathExpansion(kName, folder.name);
node->SetWithoutPathExpansion(kChildren, new base::ListValue);
- if (!AddNodeToTree(folder.parent_id, node.Pass()))
+ if (!AddNodeToTree(folder.parent_id, std::move(node)))
folders_failed.push_back(folder);
}
folders.swap(folders_failed);
@@ -196,7 +197,7 @@ void SupervisedUserBookmarksHandler::AddLinksToTree() {
}
node->SetStringWithoutPathExpansion(kUrl, url.spec());
node->SetStringWithoutPathExpansion(kName, link.name);
- if (!AddNodeToTree(link.parent_id, node.Pass())) {
+ if (!AddNodeToTree(link.parent_id, std::move(node))) {
LOG(WARNING) << "SupervisedUserBookmarksHandler::AddLinksToTree"
<< " failed to add link (url,name,parent): "
<< link.url << ", " << link.name << ", " << link.parent_id;

Powered by Google App Engine
This is Rietveld 408576698