Convert Pass()→std::move() in //components/[a-m]*

BUG=557422
R=avi@chromium.org
TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/1548193002

Cr-Commit-Position: refs/heads/master@{#366906}

7 files changed, 26 insertions, 20 deletions

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 @@ void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* delete_me) {
       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 @@ class BookmarkModelTest : public testing::Test,
     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 921e3f3..f1c8380 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 @@ void BookmarkStorage::OnLoadFinished(scoped_ptr<BookmarkLoadDetails> details) {
   if (!model_)
     return;
 
-  model_->DoneLoading(details.Pass());
+  model_->DoneLoading(std::move(details));
 }
 
 bool BookmarkStorage::SaveNow() {
@@ -228,7 +228,7 @@ bool BookmarkStorage::SaveNow() {
   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 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
   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 @@ TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
   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());
diff --git a/components/bookmarks/managed/managed_bookmark_service.cc b/components/bookmarks/managed/managed_bookmark_service.cc
index 27370b61..066df72 100644
--- a/components/bookmarks/managed/managed_bookmark_service.cc
+++ b/components/bookmarks/managed/managed_bookmark_service.cc
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ -31,8 +32,8 @@ class BookmarkPermanentNodeLoader {
   BookmarkPermanentNodeLoader(scoped_ptr<BookmarkPermanentNode> node,
                               scoped_ptr<base::ListValue> initial_bookmarks,
                               int title_id)
-      : node_(node.Pass()),
-        initial_bookmarks_(initial_bookmarks.Pass()),
+      : node_(std::move(node)),
+        initial_bookmarks_(std::move(initial_bookmarks)),
         title_id_(title_id) {
     DCHECK(node_);
   }
@@ -48,7 +49,7 @@ class BookmarkPermanentNodeLoader {
         node_.get(), initial_bookmarks_.get(), node_->id() + 1);
     node_->set_visible(!node_->empty());
     node_->SetTitle(l10n_util::GetStringUTF16(title_id_));
-    return node_.Pass();
+    return std::move(node_);
   }
 
  private:
@@ -68,7 +69,7 @@ BookmarkPermanentNodeList LoadExtraNodes(
   BookmarkPermanentNodeList extra_nodes;
   for (const auto& loader : loaders)
     extra_nodes.push_back(loader->Load(next_node_id).release());
-  return extra_nodes.Pass();
+  return extra_nodes;
 }
 
 }  // namespace
@@ -114,10 +115,11 @@ LoadExtraCallback ManagedBookmarkService::GetLoadExtraNodesCallback() {
 
   ScopedVector<BookmarkPermanentNodeLoader> loaders;
   loaders.push_back(new BookmarkPermanentNodeLoader(
-      managed.Pass(), managed_bookmarks_tracker_->GetInitialManagedBookmarks(),
+      std::move(managed),
+      managed_bookmarks_tracker_->GetInitialManagedBookmarks(),
       IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
   loaders.push_back(new BookmarkPermanentNodeLoader(
-      supervised.Pass(),
+      std::move(supervised),
       supervised_bookmarks_tracker_->GetInitialManagedBookmarks(),
       IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME));
 
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
index 07b1238..3ce78c3 100644
--- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
+++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "components/bookmarks/managed/managed_bookmarks_tracker.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ -61,7 +63,7 @@ class ManagedBookmarksTrackerTest : public testing::Test {
 
     BookmarkPermanentNodeList extra_nodes;
     extra_nodes.push_back(managed_node);
-    client_.SetExtraNodesToLoad(extra_nodes.Pass());
+    client_.SetExtraNodesToLoad(std::move(extra_nodes));
 
     model_.reset(new BookmarkModel(&client_));
     model_->AddObserver(&observer_);
diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc
index 145ad57..89ca479 100644
--- a/components/bookmarks/test/test_bookmark_client.cc
+++ b/components/bookmarks/test/test_bookmark_client.cc
@@ -5,6 +5,7 @@
 #include "components/bookmarks/test/test_bookmark_client.h"
 
 #include <stddef.h>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -24,13 +25,13 @@ scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() {
   scoped_ptr<BookmarkLoadDetails> details =
       bookmark_model->CreateLoadDetails(std::string());
   details->LoadExtraNodes();
-  bookmark_model->DoneLoading(details.Pass());
-  return bookmark_model.Pass();
+  bookmark_model->DoneLoading(std::move(details));
+  return bookmark_model;
 }
 
 void TestBookmarkClient::SetExtraNodesToLoad(
     BookmarkPermanentNodeList extra_nodes) {
-  extra_nodes_to_load_ = extra_nodes.Pass();
+  extra_nodes_to_load_ = std::move(extra_nodes);
   // Keep a copy in |extra_nodes_| for the acessor.
   extra_nodes_ = extra_nodes_to_load_.get();
 }
@@ -87,7 +88,7 @@ bool TestBookmarkClient::CanBeEditedByUser(const BookmarkNode* node) {
 BookmarkPermanentNodeList TestBookmarkClient::LoadExtraNodes(
     BookmarkPermanentNodeList extra_nodes,
     int64_t* next_id) {
-  return extra_nodes.Pass();
+  return extra_nodes;
 }
 
 }  // namespace bookmarks