summaryrefslogtreecommitdiffstats
path: root/sync/internal_api
diff options
context:
space:
mode:
authorskym <skym@chromium.org>2016-02-11 17:07:34 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-12 01:09:13 +0000
commit79ecce1aa60055c80936b135b1cf0f107bd716f2 (patch)
tree5ff8aec8b2e977c3fa1ea8ecfe56ef3328c38c0b /sync/internal_api
parent61af6e1cdaa35e293518abc1b24a679c434db75e (diff)
downloadchromium_src-79ecce1aa60055c80936b135b1cf0f107bd716f2.zip
chromium_src-79ecce1aa60055c80936b135b1cf0f107bd716f2.tar.gz
chromium_src-79ecce1aa60055c80936b135b1cf0f107bd716f2.tar.bz2
Renaming EntityData::Pass to PassToPtr to avoid Pass->std::move
presubmit checks. BUG=586305 Review URL: https://codereview.chromium.org/1692733002 Cr-Commit-Position: refs/heads/master@{#375067}
Diffstat (limited to 'sync/internal_api')
-rw-r--r--sync/internal_api/model_type_entity.cc2
-rw-r--r--sync/internal_api/model_type_entity_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sync/internal_api/model_type_entity.cc b/sync/internal_api/model_type_entity.cc
index 412c901..99e1062 100644
--- a/sync/internal_api/model_type_entity.cc
+++ b/sync/internal_api/model_type_entity.cc
@@ -51,7 +51,7 @@ ModelTypeEntity::ModelTypeEntity(const std::string& client_tag,
ModelTypeEntity::~ModelTypeEntity() {}
void ModelTypeEntity::CacheCommitData(EntityData* data) {
- commit_data_ = data->Pass();
+ commit_data_ = data->PassToPtr();
}
bool ModelTypeEntity::HasCommitData() const {
diff --git a/sync/internal_api/model_type_entity_unittest.cc b/sync/internal_api/model_type_entity_unittest.cc
index 86278f3..0f539e5 100644
--- a/sync/internal_api/model_type_entity_unittest.cc
+++ b/sync/internal_api/model_type_entity_unittest.cc
@@ -96,7 +96,7 @@ class ModelTypeEntityTest : public ::testing::Test {
UpdateResponseData response_data;
response_data.response_version = version;
- response_data.entity = data.Pass();
+ response_data.entity = data.PassToPtr();
entity->ApplyUpdateFromServer(response_data);
}