Convert Pass()→std::move() in //components/[a-m]*
BUG=557422
[email protected]
[email protected]
Review URL: https://codereview.chromium.org/1548193002
Cr-Commit-Position: refs/heads/master@{#366906}
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index 8452b11..3f9f459 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -6,6 +6,7 @@
#include <algorithm>
#include <functional>
+#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -918,7 +919,7 @@
observers_,
BookmarkNodeRemoved(this, parent, index, node.get(), removed_urls));
- undo_delegate()->OnBookmarkNodeRemoved(this, parent, index, node.Pass());
+ undo_delegate()->OnBookmarkNodeRemoved(this, parent, index, std::move(node));
}
void BookmarkModel::RemoveNodeFromInternalMaps(BookmarkNode* node) {
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc
index dee1d94..d9e724a 100644
--- a/components/bookmarks/browser/bookmark_model_unittest.cc
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -6,9 +6,9 @@
#include <stddef.h>
#include <stdint.h>
-
#include <set>
#include <string>
+#include <utility>
#include "base/base_paths.h"
#include "base/command_line.h"
@@ -426,7 +426,7 @@
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(extra_node);
- client_.SetExtraNodesToLoad(extra_nodes.Pass());
+ client_.SetExtraNodesToLoad(std::move(extra_nodes));
model_->RemoveObserver(this);
model_ = client_.CreateModel();
diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
index 921e3f3c..f1c8380b 100644
--- a/components/bookmarks/browser/bookmark_storage.cc
+++ b/components/bookmarks/browser/bookmark_storage.cc
@@ -5,8 +5,8 @@
#include "components/bookmarks/browser/bookmark_storage.h"
#include <stddef.h>
-
#include <algorithm>
+#include <utility>
#include "base/bind.h"
#include "base/compiler_specific.h"
@@ -214,7 +214,7 @@
if (!model_)
return;
- model_->DoneLoading(details.Pass());
+ model_->DoneLoading(std::move(details));
}
bool BookmarkStorage::SaveNow() {
@@ -228,7 +228,7 @@
scoped_ptr<std::string> data(new std::string);
if (!SerializeData(data.get()))
return false;
- writer_.WriteNow(data.Pass());
+ writer_.WriteNow(std::move(data));
return true;
}
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index eaeb42b..29225d4 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -5,7 +5,7 @@
#include "components/bookmarks/browser/bookmark_utils.h"
#include <stddef.h>
-
+#include <utility>
#include <vector>
#include "base/macros.h"
@@ -429,7 +429,7 @@
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(extra_node);
- client.SetExtraNodesToLoad(extra_nodes.Pass());
+ client.SetExtraNodesToLoad(std::move(extra_nodes));
scoped_ptr<BookmarkModel> model(client.CreateModel());
const BookmarkNode* node = model->AddURL(model->other_node(),
@@ -583,7 +583,7 @@
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(extra_node);
- client.SetExtraNodesToLoad(extra_nodes.Pass());
+ client.SetExtraNodesToLoad(std::move(extra_nodes));
scoped_ptr<BookmarkModel> model(client.CreateModel());
EXPECT_TRUE(model->bookmark_bar_node()->empty());
