Index: chrome/browser/sync/profile_sync_service.cc |
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc |
index 42468ab57e3fd3ad8437dd3d40e2301cf86f91ec..91b52ae1a429e1e828a302c2dc72a85594015d1c 100644 |
--- a/chrome/browser/sync/profile_sync_service.cc |
+++ b/chrome/browser/sync/profile_sync_service.cc |
@@ -1329,7 +1329,7 @@ void ProfileSyncService::UpdateSelectedTypesHistogram( |
syncer::EXTENSIONS, |
syncer::PASSWORDS, |
syncer::PREFERENCES, |
- syncer::SESSIONS, |
+ syncer::TABS, |
syncer::SYNCED_NOTIFICATIONS, |
syncer::THEMES, |
syncer::TYPED_URLS |
@@ -1343,13 +1343,13 @@ void ProfileSyncService::UpdateSelectedTypesHistogram( |
browser_sync::user_selectable_type::EXTENSIONS, |
browser_sync::user_selectable_type::PASSWORDS, |
browser_sync::user_selectable_type::PREFERENCES, |
- browser_sync::user_selectable_type::SESSIONS, |
+ browser_sync::user_selectable_type::TABS, |
browser_sync::user_selectable_type::SYNCED_NOTIFICATIONS, |
browser_sync::user_selectable_type::THEMES, |
browser_sync::user_selectable_type::TYPED_URLS |
}; |
- COMPILE_ASSERT(23 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); |
+ COMPILE_ASSERT(24 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); |
COMPILE_ASSERT(arraysize(model_types) == |
browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT, |
UpdateCustomConfigHistogram); |
@@ -1389,7 +1389,8 @@ void ProfileSyncService::RefreshSpareBootstrapToken( |
} |
#endif |
-void ProfileSyncService::OnUserChoseDatatypes(bool sync_everything, |
+void ProfileSyncService::OnUserChoseDatatypes( |
+ bool sync_everything, |
syncer::ModelTypeSet chosen_types) { |
if (!backend_.get() && !HasUnrecoverableError()) { |
NOTREACHED(); |