From cc4d506a71782f29206981ee2e48b12f38cdb619 Mon Sep 17 00:00:00 2001 From: sdefresne Date: Wed, 16 Dec 2015 07:28:49 -0800 Subject: [PATCH] Fix IOSChromeSyncClient to support syncer::TYPED_URLS. The issue http://crrev.com/1454503002 added support for TYPED_URLS to desktop ChromeSyncClient but missed IOSChromeSyncClient. Fix the omission to avoid a DCHECK downstream. BUG=562170,570296,570297 Review URL: https://codereview.chromium.org/1530123003 Cr-Commit-Position: refs/heads/master@{#365532} --- ios/chrome/browser/sync/ios_chrome_sync_client.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.cc b/ios/chrome/browser/sync/ios_chrome_sync_client.cc index ea64a8277d2942..90a53e480d887b 100644 --- a/ios/chrome/browser/sync/ios_chrome_sync_client.cc +++ b/ios/chrome/browser/sync/ios_chrome_sync_client.cc @@ -166,9 +166,7 @@ void IOSChromeSyncClient::Initialize(sync_driver::SyncService* sync_service) { } sync_driver::SyncService* IOSChromeSyncClient::GetSyncService() { - // TODO(crbug.com/558298): bring back this DCHECK after Typed URLs are - // converted to SyncableService. - // DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); + DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); return sync_service_; } @@ -290,6 +288,13 @@ IOSChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) { return history ? history->AsWeakPtr() : base::WeakPtr(); } + case syncer::TYPED_URLS: { + history::HistoryService* history = + ios::HistoryServiceFactory::GetForBrowserState( + browser_state_, ServiceAccessType::EXPLICIT_ACCESS); + return history ? history->GetTypedUrlSyncableService()->AsWeakPtr() + : base::WeakPtr(); + } case syncer::FAVICON_IMAGES: case syncer::FAVICON_TRACKING: { browser_sync::FaviconCache* favicons = @@ -320,7 +325,6 @@ IOSChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) { // TODO(crbug.com/562170) The following datatypes still need to be // transitioned to the syncer::SyncableService API: // Bookmarks - // Typed URLs NOTREACHED(); return base::WeakPtr(); }