Convert Pass()→std::move() in sync/

sync/internal_api/model_type_store_backend_unittest.cc

Index: sync/internal_api/model_type_store_backend_unittest.cc
diff --git a/sync/internal_api/model_type_store_backend_unittest.cc b/sync/internal_api/model_type_store_backend_unittest.cc
index d84d831821acd958a4ed8eefa379fea84023a173..a0aa2ec8ef1313de351bb226da64ec23fed937ee 100644
--- a/sync/internal_api/model_type_store_backend_unittest.cc
+++ b/sync/internal_api/model_type_store_backend_unittest.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/internal_api/public/model_type_store_backend.h"
+#include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "sync/internal_api/public/model_type_store_backend.h"

[Nicolas Zea, 2015/12/18 23:46:55]

keep up top

 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
@@ -28,7 +29,7 @@ class ModelTypeStoreBackendTest : public testing::Test {
     path += "/test_db";
     ModelTypeStore::Result result = backend->Init(path, in_memory_env_.get());
     EXPECT_EQ(ModelTypeStore::Result::SUCCESS, result);
-    return backend.Pass();
+    return backend;
   }
 
  protected:
@@ -44,7 +45,7 @@ TEST_F(ModelTypeStoreBackendTest, WriteThenRead) {
   scoped_ptr<leveldb::WriteBatch> write_batch(new leveldb::WriteBatch());
   write_batch->Put("prefix:id1", "data1");
   ModelTypeStore::Result result =
-      backend->WriteModifications(write_batch.Pass());
+      backend->WriteModifications(std::move(write_batch));
   ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
 
   // Read all records with prefix.
@@ -73,7 +74,7 @@ TEST_F(ModelTypeStoreBackendTest, ReadAllRecordsWithPrefix) {
   write_batch->Put("prefix1:id1", "data1");
   write_batch->Put("prefix2:id2", "data2");
   ModelTypeStore::Result result =
-      backend->WriteModifications(write_batch.Pass());
+      backend->WriteModifications(std::move(write_batch));
   ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
 
   ModelTypeStore::RecordList record_list;
@@ -94,7 +95,7 @@ TEST_F(ModelTypeStoreBackendTest, ReadDeletedRecord) {
   write_batch->Put("prefix:id1", "data1");
   write_batch->Put("prefix:id2", "data2");
   ModelTypeStore::Result result =
-      backend->WriteModifications(write_batch.Pass());
+      backend->WriteModifications(std::move(write_batch));
   ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
 
   ModelTypeStore::IdList id_list;
@@ -111,7 +112,7 @@ TEST_F(ModelTypeStoreBackendTest, ReadDeletedRecord) {
   // Delete one record.
   write_batch.reset(new leveldb::WriteBatch());
   write_batch->Delete("prefix:id2");
-  result = backend->WriteModifications(write_batch.Pass());
+  result = backend->WriteModifications(std::move(write_batch));
   ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
 
   // Ensure deleted record id is returned in missing_id_list.