diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-25 18:40:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 02:41:30 +0000 |
| commit | c80b1b61bf666dfc15b6f93e8c6701cb30dc9354 (patch) | |
| tree | 4e7d1f3609e7191aa1d6e400002aa02431de18de /sync/syncable | |
| parent | c711a7fdb28a0a6d63b6cc8f7485eee3643d2ff2 (diff) | |
| download | chromium_src-c80b1b61bf666dfc15b6f93e8c6701cb30dc9354.zip chromium_src-c80b1b61bf666dfc15b6f93e8c6701cb30dc9354.tar.gz chromium_src-c80b1b61bf666dfc15b6f93e8c6701cb30dc9354.tar.bz2 | |
Convert Pass()→std::move() in //sync
BUG=557422
Review URL: https://codereview.chromium.org/1539843002
Cr-Commit-Position: refs/heads/master@{#366886}
Diffstat (limited to 'sync/syncable')
| -rw-r--r-- | sync/syncable/directory.cc | 2 | ||||
| -rw-r--r-- | sync/syncable/directory_backing_store.cc | 2 | ||||
| -rw-r--r-- | sync/syncable/entry_kernel.cc | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc index d81b861..207b8d5 100644 --- a/sync/syncable/directory.cc +++ b/sync/syncable/directory.cc @@ -1160,7 +1160,7 @@ scoped_ptr<base::ListValue> Directory::GetNodeDetailsForType( nodes->Append(node.release()); } - return nodes.Pass(); + return nodes; } bool Directory::CheckInvariantsOnTransactionClose( diff --git a/sync/syncable/directory_backing_store.cc b/sync/syncable/directory_backing_store.cc index 2ee31e9..11355e4 100644 --- a/sync/syncable/directory_backing_store.cc +++ b/sync/syncable/directory_backing_store.cc @@ -175,7 +175,7 @@ scoped_ptr<EntryKernel> UnpackEntry(sql::Statement* statement, return scoped_ptr<EntryKernel>(); } - return kernel.Pass(); + return kernel; } namespace { diff --git a/sync/syncable/entry_kernel.cc b/sync/syncable/entry_kernel.cc index e9d21e5..f96342f 100644 --- a/sync/syncable/entry_kernel.cc +++ b/sync/syncable/entry_kernel.cc @@ -5,6 +5,7 @@ #include "sync/syncable/entry_kernel.h" #include <stdint.h> +#include <utility> #include "base/json/string_escape.h" #include "base/strings/string_number_conversions.h" @@ -111,7 +112,7 @@ void SetEncryptableProtoValues( } else { value = EntitySpecificsToValue(kernel.ref(field)); } - dictionary_value->Set(key, value.Pass()); + dictionary_value->Set(key, std::move(value)); } } |