| Index: sync/internal_api/sync_manager_impl_unittest.cc
|
| diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
|
| index 67aba25422fa7fef06a559afa0af8b8a8570b247..19c9d300df7b6c7b8867b0dfa3340fc07db5c750 100644
|
| --- a/sync/internal_api/sync_manager_impl_unittest.cc
|
| +++ b/sync/internal_api/sync_manager_impl_unittest.cc
|
| @@ -6,8 +6,11 @@
|
| // functionality is provided by the Syncable layer, which has its own
|
| // unit tests. We'll test SyncApi specific things in this harness.
|
|
|
| +#include "sync/internal_api/sync_manager_impl.h"
|
| +
|
| #include <cstddef>
|
| #include <map>
|
| +#include <utility>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| @@ -41,7 +44,6 @@
|
| #include "sync/internal_api/public/write_node.h"
|
| #include "sync/internal_api/public/write_transaction.h"
|
| #include "sync/internal_api/sync_encryption_handler_impl.h"
|
| -#include "sync/internal_api/sync_manager_impl.h"
|
| #include "sync/internal_api/syncapi_internal.h"
|
| #include "sync/js/js_backend.h"
|
| #include "sync/js/js_event_handler.h"
|
| @@ -2547,7 +2549,7 @@ class ComponentsFactory : public TestInternalComponentsFactory {
|
| sessions::SyncSessionContext* context,
|
| CancelationSignal* stop_handle) override {
|
| *session_context_ = context;
|
| - return scheduler_to_use_.Pass();
|
| + return std::move(scheduler_to_use_);
|
| }
|
|
|
| private:
|
|
|