| Index: components/history/core/browser/typed_url_syncable_service.cc
|
| diff --git a/components/history/core/browser/typed_url_syncable_service.cc b/components/history/core/browser/typed_url_syncable_service.cc
|
| index 0397d59dba97af4b5c396fb181aee936bccd368c..deaf6b27d764c1f3e769ecbec4e52f90be458695 100644
|
| --- a/components/history/core/browser/typed_url_syncable_service.cc
|
| +++ b/components/history/core/browser/typed_url_syncable_service.cc
|
| @@ -71,7 +71,7 @@ TypedUrlSyncableService::TypedUrlSyncableService(
|
| num_db_errors_(0),
|
| history_backend_observer_(this) {
|
| DCHECK(history_backend_);
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
| }
|
|
|
| TypedUrlSyncableService::~TypedUrlSyncableService() {
|
| @@ -82,7 +82,7 @@ syncer::SyncMergeResult TypedUrlSyncableService::MergeDataAndStartSyncing(
|
| const syncer::SyncDataList& initial_sync_data,
|
| std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| std::unique_ptr<syncer::SyncErrorFactory> error_handler) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
| DCHECK(!sync_processor_.get());
|
| DCHECK(sync_processor.get());
|
| DCHECK(error_handler.get());
|
| @@ -211,7 +211,7 @@ syncer::SyncMergeResult TypedUrlSyncableService::MergeDataAndStartSyncing(
|
| }
|
|
|
| void TypedUrlSyncableService::StopSyncing(syncer::ModelType type) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
| DCHECK_EQ(type, syncer::TYPED_URLS);
|
|
|
| // Clear cache of server state.
|
| @@ -227,7 +227,7 @@ void TypedUrlSyncableService::StopSyncing(syncer::ModelType type) {
|
|
|
| syncer::SyncDataList TypedUrlSyncableService::GetAllSyncData(
|
| syncer::ModelType type) const {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
| syncer::SyncDataList list;
|
|
|
| // TODO(sync): Add implementation
|
| @@ -238,7 +238,7 @@ syncer::SyncDataList TypedUrlSyncableService::GetAllSyncData(
|
| syncer::SyncError TypedUrlSyncableService::ProcessSyncChanges(
|
| const tracked_objects::Location& from_here,
|
| const syncer::SyncChangeList& change_list) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
|
|
| std::vector<GURL> pending_deleted_urls;
|
| history::URLRows new_synced_urls;
|
| @@ -288,7 +288,7 @@ syncer::SyncError TypedUrlSyncableService::ProcessSyncChanges(
|
| void TypedUrlSyncableService::OnURLsModified(
|
| history::HistoryBackend* history_backend,
|
| const history::URLRows& changed_urls) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
|
|
| if (processing_syncer_changes_)
|
| return; // These are changes originating from us, ignore.
|
| @@ -318,7 +318,7 @@ void TypedUrlSyncableService::OnURLVisited(
|
| const history::URLRow& row,
|
| const history::RedirectList& redirects,
|
| base::Time visit_time) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
|
|
| if (processing_syncer_changes_)
|
| return; // These are changes originating from us, ignore.
|
| @@ -343,7 +343,7 @@ void TypedUrlSyncableService::OnURLsDeleted(
|
| bool expired,
|
| const history::URLRows& deleted_rows,
|
| const std::set<GURL>& favicon_urls) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(sequence_checker_.CalledOnValidSequence());
|
|
|
| if (processing_syncer_changes_)
|
| return; // These are changes originating from us, ignore.
|
|
|