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

sync/internal_api/model_type_entity_unittest.cc

Index: sync/internal_api/model_type_entity_unittest.cc
diff --git a/sync/internal_api/model_type_entity_unittest.cc b/sync/internal_api/model_type_entity_unittest.cc
index 08de2fc1525435e209b4d3c3740909b492cf4c1f..2a53089a85f50c01f8da54f84dcb679ccc13a09d 100644
--- a/sync/internal_api/model_type_entity_unittest.cc
+++ b/sync/internal_api/model_type_entity_unittest.cc
@@ -2,15 +2,15 @@
 // 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_entity.h"
+#include <utility>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/model_type_entity.h"

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

keep up top

 #include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/syncable_util.h"
-
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer_v2 {
@@ -52,7 +52,7 @@ class ModelTypeEntityTest : public ::testing::Test {
       const sync_pb::EntitySpecifics& specifics) {
     scoped_ptr<ModelTypeEntity> entity(NewLocalItem(tag));
     MakeLocalChange(entity.get(), specifics);
-    return entity.Pass();
+    return entity;
   }
 
   void MakeLocalChange(ModelTypeEntity* entity,
@@ -60,7 +60,7 @@ class ModelTypeEntityTest : public ::testing::Test {
     scoped_ptr<EntityData> entity_data = make_scoped_ptr(new EntityData());
     entity_data->specifics = specifics;
     entity_data->non_unique_name = "foo";
-    entity->MakeLocalChange(entity_data.Pass(), kMtime);
+    entity->MakeLocalChange(std::move(entity_data), kMtime);
   }
 
   scoped_ptr<ModelTypeEntity> NewServerItem() {
@@ -73,7 +73,7 @@ class ModelTypeEntityTest : public ::testing::Test {
       const sync_pb::EntitySpecifics& specifics) {
     scoped_ptr<ModelTypeEntity> entity(NewServerItem());
     ApplyUpdateFromServer(entity.get(), version, specifics);
-    return entity.Pass();
+    return entity;
   }
 
   void ApplyUpdateFromServer(ModelTypeEntity* entity,