| 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 06e65e2119535285103684ec190a6580a5c5dc86..9eb8dc3349543eca75093ca5bc0753ea2201347d 100644
|
| --- a/sync/internal_api/sync_manager_impl_unittest.cc
|
| +++ b/sync/internal_api/sync_manager_impl_unittest.cc
|
| @@ -24,6 +24,7 @@
|
| #include "base/test/values_test_util.h"
|
| #include "base/values.h"
|
| #include "sync/engine/sync_scheduler.h"
|
| +#include "sync/internal_api/public/base/cancelation_signal.h"
|
| #include "sync/internal_api/public/base/model_type_test_util.h"
|
| #include "sync/internal_api/public/change_record.h"
|
| #include "sync/internal_api/public/engine/model_safe_worker.h"
|
| @@ -835,7 +836,8 @@ class SyncManagerTest : public testing::Test,
|
| scoped_ptr<UnrecoverableErrorHandler>(
|
| new TestUnrecoverableErrorHandler).Pass(),
|
| NULL,
|
| - false);
|
| + false,
|
| + &cancelation_signal_);
|
|
|
| sync_manager_.GetEncryptionHandler()->AddObserver(&encryption_observer_);
|
|
|
| @@ -1018,6 +1020,7 @@ class SyncManagerTest : public testing::Test,
|
| protected:
|
| FakeEncryptor encryptor_;
|
| SyncManagerImpl sync_manager_;
|
| + CancelationSignal cancelation_signal_;
|
| WeakHandle<JsBackend> js_backend_;
|
| StrictMock<SyncManagerObserverMock> manager_observer_;
|
| StrictMock<SyncEncryptionHandlerObserverMock> encryption_observer_;
|
| @@ -2796,7 +2799,8 @@ class ComponentsFactory : public TestInternalComponentsFactory {
|
|
|
| virtual scoped_ptr<SyncScheduler> BuildScheduler(
|
| const std::string& name,
|
| - sessions::SyncSessionContext* context) OVERRIDE {
|
| + sessions::SyncSessionContext* context,
|
| + CancelationSignal* stop_handle) OVERRIDE {
|
| *session_context_ = context;
|
| return scheduler_to_use_.Pass();
|
| }
|
|
|