diff options
Diffstat (limited to 'chrome/test/sync/engine')
| -rw-r--r-- | chrome/test/sync/engine/mock_connection_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/test/sync/engine/syncer_command_test.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/test/sync/engine/mock_connection_manager.cc b/chrome/test/sync/engine/mock_connection_manager.cc index bfba668..24ad1f2 100644 --- a/chrome/test/sync/engine/mock_connection_manager.cc +++ b/chrome/test/sync/engine/mock_connection_manager.cc @@ -33,7 +33,7 @@ using syncable::WriteTransaction; MockConnectionManager::MockConnectionManager(DirectoryManager* dirmgr, const string& name) - : ServerConnectionManager("unused", 0, false, "version", "id"), + : ServerConnectionManager("unused", 0, false, "version"), conflict_all_commits_(false), conflict_n_commits_(0), next_new_id_(10000), diff --git a/chrome/test/sync/engine/syncer_command_test.h b/chrome/test/sync/engine/syncer_command_test.h index eed8def..02ea57d 100644 --- a/chrome/test/sync/engine/syncer_command_test.h +++ b/chrome/test/sync/engine/syncer_command_test.h @@ -48,6 +48,9 @@ class SyncerCommandTestWithParam : public testing::TestWithParam<T>, virtual void OnShouldStopSyncingPermanently() { FAIL() << "Shouldn't be forced to stop syncing."; } + virtual void SignalUpdatedToken(const std::string& token) { + FAIL() << "Should never update token."; + } // ModelSafeWorkerRegistrar implementation. virtual void GetWorkers(std::vector<ModelSafeWorker*>* out) { @@ -91,7 +94,7 @@ class SyncerCommandTestWithParam : public testing::TestWithParam<T>, void ResetContext() { context_.reset(new sessions::SyncSessionContext( - mock_server_.get(), NULL, syncdb_->manager(), registrar())); + mock_server_.get(), syncdb_->manager(), registrar())); context_->set_account_name(syncdb_->name()); ClearSession(); } |