| Index: sync/tools/sync_client.cc
|
| diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
|
| index dbb14212c255953cdea4da4141467e113dc18682..6d2809efafe6ead8cd386776246dfe6848f41f53 100644
|
| --- a/sync/tools/sync_client.cc
|
| +++ b/sync/tools/sync_client.cc
|
| @@ -5,6 +5,7 @@
|
| #include <cstddef>
|
| #include <cstdio>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/at_exit.h"
|
| #include "base/command_line.h"
|
| @@ -238,7 +239,7 @@ class InvalidatorShim : public InvalidationHandler {
|
| ++inv_it) {
|
| scoped_ptr<syncer::InvalidationInterface> inv_adapter(
|
| new InvalidationAdapter(*inv_it));
|
| - sync_manager_->OnIncomingInvalidation(type, inv_adapter.Pass());
|
| + sync_manager_->OnIncomingInvalidation(type, std::move(inv_adapter));
|
| }
|
| }
|
| }
|
| @@ -424,7 +425,7 @@ int SyncClientMain(int argc, char* argv[]) {
|
| args.database_location = database_dir.path();
|
| args.event_handler = WeakHandle<JsEventHandler>(js_event_handler.AsWeakPtr());
|
| args.service_url = GURL(kSyncServiceURL);
|
| - args.post_factory = post_factory.Pass();
|
| + args.post_factory = std::move(post_factory);
|
| args.workers = workers;
|
| args.extensions_activity = extensions_activity;
|
| args.change_delegate = &change_delegate;
|
|
|