| Index: sync/internal_api/sync_rollback_manager_base.cc
|
| diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc
|
| index 2de9686ceab6074f4135f1f2dd262ac83f592170..df9dc7c3fcae032c5a976491d7c6bc4a7c6cb077 100644
|
| --- a/sync/internal_api/sync_rollback_manager_base.cc
|
| +++ b/sync/internal_api/sync_rollback_manager_base.cc
|
| @@ -218,7 +218,7 @@ syncer_v2::SyncContextProxy* SyncRollbackManagerBase::GetSyncContextProxy() {
|
|
|
| ScopedVector<syncer::ProtocolEvent>
|
| SyncRollbackManagerBase::GetBufferedProtocolEvents() {
|
| - return ScopedVector<syncer::ProtocolEvent>().Pass();
|
| + return ScopedVector<syncer::ProtocolEvent>();
|
| }
|
|
|
| scoped_ptr<base::ListValue> SyncRollbackManagerBase::GetAllNodesForType(
|
| @@ -227,7 +227,7 @@ scoped_ptr<base::ListValue> SyncRollbackManagerBase::GetAllNodesForType(
|
| scoped_ptr<base::ListValue> nodes(
|
| trans.GetDirectory()->GetNodeDetailsForType(trans.GetWrappedTrans(),
|
| type));
|
| - return nodes.Pass();
|
| + return nodes;
|
| }
|
|
|
| bool SyncRollbackManagerBase::InitBackupDB(
|
| @@ -237,8 +237,8 @@ bool SyncRollbackManagerBase::InitBackupDB(
|
| base::FilePath backup_db_path = sync_folder.Append(
|
| syncable::Directory::kSyncDatabaseFilename);
|
| scoped_ptr<syncable::DirectoryBackingStore> backing_store =
|
| - internal_components_factory->BuildDirectoryBackingStore(
|
| - storage, "backup", backup_db_path).Pass();
|
| + internal_components_factory->BuildDirectoryBackingStore(storage, "backup",
|
| + backup_db_path);
|
|
|
| DCHECK(backing_store.get());
|
| share_.directory.reset(
|
|
|