Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Unified Diff: ios/chrome/browser/sync/ios_chrome_sync_client.mm

Issue 2254083002: [Sync] Convert NonBlockingDataTypeController to be single-thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dt
Patch Set: Update DeviceInfoService. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/sync/ios_chrome_sync_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/sync/ios_chrome_sync_client.mm
diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.mm b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
index 9b17cbfa2fea7ba3ffff58637a5c19eb5cc06afe..0e6c753b1c060dd7fa335bc0c2065360381df4a2 100644
--- a/ios/chrome/browser/sync/ios_chrome_sync_client.mm
+++ b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
@@ -327,16 +327,17 @@ IOSChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
}
}
-syncer_v2::ModelTypeService* IOSChromeSyncClient::GetModelTypeServiceForType(
- syncer::ModelType type) {
+base::WeakPtr<syncer_v2::ModelTypeService>
+IOSChromeSyncClient::GetModelTypeServiceForType(syncer::ModelType type) {
switch (type) {
case syncer::DEVICE_INFO:
return IOSChromeProfileSyncServiceFactory::GetForBrowserState(
browser_state_)
- ->GetDeviceInfoService();
+ ->GetDeviceInfoService()
+ ->AsWeakPtr();
default:
NOTREACHED();
- return nullptr;
+ return base::WeakPtr<syncer_v2::ModelTypeService>();
}
}
« no previous file with comments | « ios/chrome/browser/sync/ios_chrome_sync_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698