[Sync] Sort protos in proto_visitors.h

components/sync/protocol/proto_visitors.h

Index: components/sync/protocol/proto_visitors.h
diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h
index 56175cf6dbc64c57f49ebd586170916552e61cf1..36de10727a834b00532f30bfdffb566ded514ca3 100644
--- a/components/sync/protocol/proto_visitors.h
+++ b/components/sync/protocol/proto_visitors.h
@@ -85,110 +85,6 @@
 
 namespace syncer {
 
-VISIT_PROTO_FIELDS(const sync_pb::EncryptedData& proto) {
-  VISIT(key_name);
-  // TODO(akalin): Shouldn't blob be of type bytes instead of string?
-  VISIT_BYTES(blob);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::PasswordSpecificsMetadata& proto) {
-  VISIT(url);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::AppNotificationSettings& proto) {
-  VISIT(initial_setup_done);
-  VISIT(disabled);
-  VISIT(oauth_client_id);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::SessionHeader& proto) {
-  VISIT_REP(window);
-  VISIT(client_name);
-  VISIT_ENUM(device_type);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::SessionTab& proto) {
-  VISIT(tab_id);
-  VISIT(window_id);
-  VISIT(tab_visual_index);
-  VISIT(current_navigation_index);
-  VISIT(pinned);
-  VISIT(extension_app_id);
-  VISIT_REP(navigation);
-  VISIT_BYTES(favicon);
-  VISIT_ENUM(favicon_type);
-  VISIT(favicon_source);
-  VISIT_REP(variation_id);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::SessionWindow& proto) {
-  VISIT(window_id);
-  VISIT(selected_tab_index);
-  VISIT_REP(tab);
-  VISIT_ENUM(browser_type);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::TabNavigation& proto) {
-  VISIT(virtual_url);
-  VISIT(referrer);
-  VISIT(title);
-  VISIT_ENUM(page_transition);
-  VISIT_ENUM(redirect_type);
-  VISIT(unique_id);
-  VISIT(timestamp_msec);
-  VISIT(navigation_forward_back);
-  VISIT(navigation_from_address_bar);
-  VISIT(navigation_home_page);
-  VISIT(navigation_chain_start);
-  VISIT(navigation_chain_end);
-  VISIT(global_id);
-  VISIT(search_terms);
-  VISIT(favicon_url);
-  VISIT_ENUM(blocked_state);
-  VISIT_REP(content_pack_categories);
-  VISIT(http_status_code);
-  VISIT(obsolete_referrer_policy);
-  VISIT(is_restored);
-  VISIT_REP(navigation_redirect);
-  VISIT(last_navigation_redirect_url);
-  VISIT(correct_referrer_policy);
-  VISIT_ENUM(password_state);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::NavigationRedirect& proto) {
-  VISIT(url);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::PasswordSpecificsData& proto) {
-  VISIT(scheme);
-  VISIT(signon_realm);
-  VISIT(origin);
-  VISIT(action);
-  VISIT(username_element);
-  VISIT(username_value);
-  VISIT(password_element);
-  VISIT(password_value);
-  VISIT(preferred);
-  VISIT(date_created);
-  VISIT(blacklisted);
-  VISIT(type);
-  VISIT(times_used);
-  VISIT(display_name);
-  VISIT(avatar_url);
-  VISIT(federation_url);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::GlobalIdDirective& proto) {
-  VISIT_REP(global_id);
-  VISIT(start_time_usec);
-  VISIT(end_time_usec);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::TimeRangeDirective& proto) {
-  VISIT(start_time_usec);
-  VISIT(end_time_usec);
-}
-
 VISIT_PROTO_FIELDS(const sync_pb::AppListSpecifics& proto) {
   VISIT(item_id);
   VISIT_ENUM(item_type);
@@ -198,27 +94,6 @@ VISIT_PROTO_FIELDS(const sync_pb::AppListSpecifics& proto) {
   VISIT(item_pin_ordinal);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ArcPackageSpecifics& proto) {
-  VISIT(package_name);
-  VISIT(package_version);
-  VISIT(last_backup_android_id);
-  VISIT(last_backup_time);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::PrinterPPDReference& proto) {
-  VISIT(user_supplied_ppd_url);
-  VISIT(effective_make_and_model);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::ReadingListSpecifics& proto) {
-  VISIT(entry_id);
-  VISIT(title);
-  VISIT(url);
-  VISIT(creation_time_us);
-  VISIT(update_time_us);
-  VISIT_ENUM(status);
-}
-
 VISIT_PROTO_FIELDS(const sync_pb::AppNotification& proto) {
   VISIT(guid);
   VISIT(app_id);
@@ -229,13 +104,14 @@ VISIT_PROTO_FIELDS(const sync_pb::AppNotification& proto) {
   VISIT(link_text);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::AppSettingSpecifics& proto) {
-  VISIT(extension_setting);
+VISIT_PROTO_FIELDS(const sync_pb::AppNotificationSettings& proto) {
+  VISIT(initial_setup_done);
+  VISIT(disabled);
+  VISIT(oauth_client_id);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::LinkedAppIconInfo& proto) {
-  VISIT(url);
-  VISIT(size);
+VISIT_PROTO_FIELDS(const sync_pb::AppSettingSpecifics& proto) {
+  VISIT(extension_setting);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::AppSpecifics& proto) {
@@ -250,11 +126,43 @@ VISIT_PROTO_FIELDS(const sync_pb::AppSpecifics& proto) {
   VISIT_REP(linked_app_icons);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::AutofillSpecifics& proto) {
-  VISIT(name);
-  VISIT(value);
-  VISIT_REP(usage_timestamp);
-  VISIT(profile);
+VISIT_PROTO_FIELDS(const sync_pb::ArcPackageSpecifics& proto) {
+  VISIT(package_name);
+  VISIT(package_version);
+  VISIT(last_backup_android_id);
+  VISIT(last_backup_time);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::ArticleAttachments& proto) {
+  VISIT(distilled_article);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::ArticlePage& proto) {
+  VISIT(url);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::ArticleSpecifics& proto) {
+  VISIT(entry_id);
+  VISIT(title);
+  VISIT_REP(pages);
+  VISIT(attachments);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::AttachmentIdProto& proto) {
+  VISIT(unique_id);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::AttachmentMetadata& proto) {
+  VISIT_REP(record);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::AttachmentMetadataRecord& proto) {
+  VISIT(id);
+  VISIT(is_on_server);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::AutofillCullingFlags& proto) {
+  VISIT(enabled);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::AutofillProfileSpecifics& proto) {
@@ -281,13 +189,11 @@ VISIT_PROTO_FIELDS(const sync_pb::AutofillProfileSpecifics& proto) {
   VISIT_REP(phone_home_whole_number);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::WalletMetadataSpecifics& proto) {
-  VISIT_ENUM(type);
-  VISIT(id);
-  VISIT(use_count);
-  VISIT(use_date);
-  VISIT(card_billing_address_id);
-  VISIT(address_has_converted);
+VISIT_PROTO_FIELDS(const sync_pb::AutofillSpecifics& proto) {
+  VISIT(name);
+  VISIT(value);
+  VISIT_REP(usage_timestamp);
+  VISIT(profile);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::AutofillWalletSpecifics& proto) {
@@ -296,11 +202,6 @@ VISIT_PROTO_FIELDS(const sync_pb::AutofillWalletSpecifics& proto) {
   VISIT(address);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::MetaInfo& proto) {
-  VISIT(key);
-  VISIT(value);
-}
-
 VISIT_PROTO_FIELDS(const sync_pb::BookmarkSpecifics& proto) {
   VISIT(url);
   VISIT_BYTES(favicon);
@@ -310,45 +211,150 @@ VISIT_PROTO_FIELDS(const sync_pb::BookmarkSpecifics& proto) {
   VISIT_REP(meta_info);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
-  VISIT(cache_guid);
-  VISIT(client_name);
-  VISIT_ENUM(device_type);
-  VISIT(sync_user_agent);
-  VISIT(chrome_version);
-  VISIT(signin_scoped_device_id);
+VISIT_PROTO_FIELDS(const sync_pb::ChromiumExtensionsActivity& proto) {
+  VISIT(extension_id);
+  VISIT(bookmark_writes_since_last_commit);
 }
-VISIT_PROTO_FIELDS(const sync_pb::DictionarySpecifics& proto) {
-  VISIT(word);
+
+VISIT_PROTO_FIELDS(const sync_pb::ClientCommand& proto) {
+  VISIT(set_sync_poll_interval);
+  VISIT(set_sync_long_poll_interval);
+  VISIT(max_commit_batch_size);
+  VISIT(sessions_commit_delay_seconds);
+  VISIT(throttle_delay_seconds);
+  VISIT(client_invalidation_hint_buffer_size);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::FaviconSyncFlags& proto) {
-  VISIT(enabled);
-  VISIT(favicon_sync_limit);
+VISIT_PROTO_FIELDS(const sync_pb::ClientConfigParams& proto) {
+  VISIT_REP(enabled_type_ids);
+  VISIT(tabs_datatype_enabled);
+  VISIT(cookie_jar_mismatch);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::KeystoreEncryptionFlags& proto) {
-  VISIT(enabled);
+VISIT_PROTO_FIELDS(const sync_pb::ClientStatus& proto) {
+  VISIT(hierarchy_conflict_detected);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::HistoryDeleteDirectives& proto) {
-  VISIT(enabled);
+VISIT_PROTO_FIELDS(const sync_pb::ClientToServerMessage& proto) {
+  VISIT(share);
+  VISIT(protocol_version);
+  VISIT(commit);
+  VISIT(get_updates);
+  VISIT(store_birthday);
+  VISIT(sync_problem_detected);
+  VISIT(debug_info);
+  VISIT(client_status);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::AutofillCullingFlags& proto) {
-  VISIT(enabled);
+VISIT_PROTO_FIELDS(const sync_pb::ClientToServerResponse& proto) {
+  VISIT(commit);
+  VISIT(get_updates);
+  VISIT(error);
+  VISIT_ENUM(error_code);
+  VISIT(error_message);
+  VISIT(store_birthday);
+  VISIT(client_command);
+  VISIT_REP(migrated_data_type_id);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::PreCommitUpdateAvoidanceFlags& proto) {
-  VISIT(enabled);
+VISIT_PROTO_FIELDS(const sync_pb::ClientToServerResponse::Error& proto) {
+  VISIT_ENUM(error_type);
+  VISIT(error_description);
+  VISIT(url);
+  VISIT_ENUM(action);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::GcmChannelFlags& proto) {
-  VISIT(enabled);
+VISIT_PROTO_FIELDS(const sync_pb::CommitMessage& proto) {
+  VISIT_REP(entries);
+  VISIT(cache_guid);
+  VISIT_REP(extensions_activity);
+  VISIT(config_params);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::GcmInvalidationsFlags& proto) {
-  VISIT(enabled);
+VISIT_PROTO_FIELDS(const sync_pb::CommitResponse& proto) {
+  VISIT_REP(entryresponse);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::CommitResponse::EntryResponse& proto) {
+  VISIT_ENUM(response_type);
+  VISIT(id_string);
+  VISIT(parent_id_string);
+  VISIT(position_in_parent);
+  VISIT(version);
+  VISIT(name);
+  VISIT(error_message);
+  VISIT(mtime);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::DataTypeContext& proto) {
+  VISIT(data_type_id);
+  VISIT(context);
+  VISIT(version);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::DataTypeProgressMarker& proto) {
+  VISIT(data_type_id);
+  VISIT_BYTES(token);
+  VISIT(timestamp_token_for_migration);
+  VISIT(notification_hint);
+  VISIT(get_update_triggers);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::DatatypeAssociationStats& proto) {
+  VISIT(data_type_id);
+  VISIT(num_local_items_before_association);
+  VISIT(num_sync_items_before_association);
+  VISIT(num_local_items_after_association);
+  VISIT(num_sync_items_after_association);
+  VISIT(num_local_items_added);
+  VISIT(num_local_items_deleted);
+  VISIT(num_local_items_modified);
+  VISIT(num_sync_items_added);
+  VISIT(num_sync_items_deleted);
+  VISIT(num_sync_items_modified);
+  VISIT(local_version_pre_association);
+  VISIT(sync_version_pre_association);
+  VISIT(had_error);
+  VISIT(download_wait_time_us);
+  VISIT(download_time_us);
+  VISIT(association_wait_time_for_high_priority_us);
+  VISIT(association_wait_time_for_same_priority_us);
+  VISIT_REP(high_priority_type_configured_before);
+  VISIT_REP(same_priority_type_configured_before);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::DebugEventInfo& proto) {
+  VISIT_ENUM(singleton_event);
+  VISIT(sync_cycle_completed_event_info);
+  VISIT(nudging_datatype);
+  VISIT_REP(datatypes_notified_from_server);
+  VISIT(datatype_association_stats);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::DebugInfo& proto) {
+  VISIT_REP(events);
+  VISIT(cryptographer_ready);
+  VISIT(cryptographer_has_pending_keys);
+  VISIT(events_dropped);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
+  VISIT(cache_guid);
+  VISIT(client_name);
+  VISIT_ENUM(device_type);
+  VISIT(sync_user_agent);
+  VISIT(chrome_version);
+  VISIT(signin_scoped_device_id);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::DictionarySpecifics& proto) {
+  VISIT(word);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::EncryptedData& proto) {
+  VISIT(key_name);
+  // TODO(akalin): Shouldn't blob be of type bytes instead of string?

[skym, 2017/03/31 00:08:11]

Is this TODO still relevant?

[pavely, 2017/03/31 04:06:46]

blob is still declared as string in encryption.proto. It doesn't cause any
issues on the client side and it won't make any difference if it is turned into
bytes. The difference might show up on server side as string and bytes fields
are mapped into different types with different interfaces (String vs.
ByteString). I'd rather test that server still compiles with the change, but
don't want to do it for this particular change.

+  VISIT_BYTES(blob);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::EnhancedBookmarksFlags& proto) {
@@ -356,8 +362,58 @@ VISIT_PROTO_FIELDS(const sync_pb::EnhancedBookmarksFlags& proto) {
   VISIT(extension_id);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::WalletSyncFlags& proto) {
-  VISIT(enabled);
+VISIT_PROTO_FIELDS(const sync_pb::EntityMetadata& proto) {
+  VISIT(client_tag_hash);
+  VISIT(server_id);
+  VISIT(is_deleted);
+  VISIT(sequence_number);
+  VISIT(acked_sequence_number);
+  VISIT(server_version);
+  VISIT(creation_time);
+  VISIT(modification_time);
+  VISIT(specifics_hash);
+  VISIT(base_specifics_hash);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::EntitySpecifics& proto) {
+  VISIT(encrypted);
+  VISIT(app);
+  VISIT(app_list);
+  VISIT(app_notification);
+  VISIT(app_setting);
+  VISIT(arc_package);
+  VISIT(article);
+  VISIT(autofill);
+  VISIT(autofill_profile);
+  VISIT(autofill_wallet);
+  VISIT(bookmark);
+  VISIT(device_info);
+  VISIT(dictionary);
+  VISIT(experiments);
+  VISIT(extension);
+  VISIT(extension_setting);
+  VISIT(favicon_image);
+  VISIT(favicon_tracking);
+  VISIT(history_delete_directive);
+  VISIT(managed_user);
+  VISIT(managed_user_setting);
+  VISIT(managed_user_shared_setting);
+  VISIT(managed_user_whitelist);
+  VISIT(nigori);
+  VISIT(password);
+  VISIT(preference);
+  VISIT(printer);
+  VISIT(priority_preference);
+  VISIT(reading_list);
+  VISIT(search_engine);
+  VISIT(session);
+  VISIT(synced_notification);
+  VISIT(synced_notification_app_info);
+  VISIT(theme);
+  VISIT(typed_url);
+  VISIT(user_event);
+  VISIT(wallet_metadata);
+  VISIT(wifi_credential);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::ExperimentsSpecifics& proto) {
@@ -405,22 +461,93 @@ VISIT_PROTO_FIELDS(const sync_pb::FaviconImageSpecifics& proto) {
   VISIT(favicon_touch_precomposed_64);
 }
 
+VISIT_PROTO_FIELDS(const sync_pb::FaviconSyncFlags& proto) {
+  VISIT(enabled);
+  VISIT(favicon_sync_limit);
+}
+
 VISIT_PROTO_FIELDS(const sync_pb::FaviconTrackingSpecifics& proto) {
   VISIT(favicon_url);
   VISIT(last_visit_time_ms);
   VISIT(is_bookmarked);
 }
 
+VISIT_PROTO_FIELDS(const sync_pb::GcmChannelFlags& proto) {
+  VISIT(enabled);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::GcmInvalidationsFlags& proto) {
+  VISIT(enabled);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::GetUpdateTriggers& proto) {
+  VISIT_REP(notification_hint);
+  VISIT(client_dropped_hints);
+  VISIT(invalidations_out_of_sync);
+  VISIT(local_modification_nudges);
+  VISIT(datatype_refresh_nudges);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::GetUpdatesCallerInfo& proto) {
+  VISIT_ENUM(source);
+  VISIT(notifications_enabled);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::GetUpdatesMessage& proto) {
+  VISIT(caller_info);
+  VISIT(fetch_folders);
+  VISIT(batch_size);
+  VISIT_REP(from_progress_marker);
+  VISIT(streaming);
+  VISIT(need_encryption_key);
+  VISIT(create_mobile_bookmarks_folder);
+  VISIT_ENUM(get_updates_origin);
+  VISIT_REP(client_contexts);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::GetUpdatesResponse& proto) {
+  VISIT_REP(entries)
+  VISIT(changes_remaining);
+  VISIT_REP(new_progress_marker);
+  VISIT_REP(context_mutations);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::GlobalIdDirective& proto) {
+  VISIT_REP(global_id);
+  VISIT(start_time_usec);
+  VISIT(end_time_usec);
+}
+
 VISIT_PROTO_FIELDS(const sync_pb::HistoryDeleteDirectiveSpecifics& proto) {
   VISIT(global_id_directive);
   VISIT(time_range_directive);
 }
 
+VISIT_PROTO_FIELDS(const sync_pb::HistoryDeleteDirectives& proto) {
+  VISIT(enabled);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::KeystoreEncryptionFlags& proto) {
+  VISIT(enabled);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::LinkedAppIconInfo& proto) {
+  VISIT(url);
+  VISIT(size);
+}
+
 VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSettingSpecifics& proto) {
   VISIT(name);
   VISIT(value);
 }
 
+VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSharedSettingSpecifics& proto) {
+  VISIT(mu_id);
+  VISIT(key);
+  VISIT(value);
+  VISIT(acknowledged);
+}
+
 VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSpecifics& proto) {
   VISIT(id);
   VISIT(name);
@@ -432,16 +559,25 @@ VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSpecifics& proto) {
   VISIT(password_encryption_key);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSharedSettingSpecifics& proto) {
-  VISIT(mu_id);
+VISIT_PROTO_FIELDS(const sync_pb::ManagedUserWhitelistSpecifics& proto) {
+  VISIT(id);
+  VISIT(name);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::MetaInfo& proto) {
   VISIT(key);
   VISIT(value);
-  VISIT(acknowledged);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ManagedUserWhitelistSpecifics& proto) {
-  VISIT(id);
-  VISIT(name);
+VISIT_PROTO_FIELDS(const sync_pb::ModelTypeState& proto) {
+  VISIT(progress_marker);
+  VISIT(type_context);
+  VISIT(encryption_key_name);
+  VISIT(initial_sync_done);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::NavigationRedirect& proto) {
+  VISIT(url);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::NigoriSpecifics& proto) {
@@ -473,30 +609,47 @@ VISIT_PROTO_FIELDS(const sync_pb::NigoriSpecifics& proto) {
   VISIT(custom_passphrase_time);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ArticlePage& proto) {
-  VISIT(url);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::ArticleSpecifics& proto) {
-  VISIT(entry_id);
-  VISIT(title);
-  VISIT_REP(pages);
-  VISIT(attachments);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::ArticleAttachments& proto) {
-  VISIT(distilled_article);
-}
-
 VISIT_PROTO_FIELDS(const sync_pb::PasswordSpecifics& proto) {
   VISIT(encrypted);
   VISIT(unencrypted_metadata);
   VISIT(client_only_encrypted_data);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::PreferenceSpecifics& proto) {
-  VISIT(name);
-  VISIT(value);
+VISIT_PROTO_FIELDS(const sync_pb::PasswordSpecificsData& proto) {
+  VISIT(scheme);
+  VISIT(signon_realm);
+  VISIT(origin);
+  VISIT(action);
+  VISIT(username_element);
+  VISIT(username_value);
+  VISIT(password_element);
+  VISIT(password_value);
+  VISIT(preferred);
+  VISIT(date_created);
+  VISIT(blacklisted);
+  VISIT(type);
+  VISIT(times_used);
+  VISIT(display_name);
+  VISIT(avatar_url);
+  VISIT(federation_url);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::PasswordSpecificsMetadata& proto) {
+  VISIT(url);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::PreCommitUpdateAvoidanceFlags& proto) {
+  VISIT(enabled);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::PreferenceSpecifics& proto) {
+  VISIT(name);
+  VISIT(value);
+}
+
+VISIT_PROTO_FIELDS(const sync_pb::PrinterPPDReference& proto) {
+  VISIT(user_supplied_ppd_url);
+  VISIT(effective_make_and_model);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::PrinterSpecifics& proto) {
@@ -514,9 +667,14 @@ VISIT_PROTO_FIELDS(const sync_pb::PriorityPreferenceSpecifics& proto) {
   VISIT(preference);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::SyncedNotificationAppInfoSpecifics& proto) {}
-
-VISIT_PROTO_FIELDS(const sync_pb::SyncedNotificationSpecifics& proto) {}
+VISIT_PROTO_FIELDS(const sync_pb::ReadingListSpecifics& proto) {
+  VISIT(entry_id);
+  VISIT(title);
+  VISIT(url);
+  VISIT(creation_time_us);
+  VISIT(update_time_us);
+  VISIT_ENUM(status);
+}
 
 VISIT_PROTO_FIELDS(const sync_pb::SearchEngineSpecifics& proto) {
   VISIT(short_name);
@@ -543,6 +701,12 @@ VISIT_PROTO_FIELDS(const sync_pb::SearchEngineSpecifics& proto) {
   VISIT(new_tab_url);
 }
 
+VISIT_PROTO_FIELDS(const sync_pb::SessionHeader& proto) {
+  VISIT_REP(window);
+  VISIT(client_name);
+  VISIT_ENUM(device_type);
+}
+
 VISIT_PROTO_FIELDS(const sync_pb::SessionSpecifics& proto) {
   VISIT(session_tag);
   VISIT(header);
@@ -550,107 +714,40 @@ VISIT_PROTO_FIELDS(const sync_pb::SessionSpecifics& proto) {
   VISIT(tab_node_id);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ThemeSpecifics& proto) {
-  VISIT(use_custom_theme);
-  VISIT(use_system_theme_by_default);
-  VISIT(custom_theme_name);
-  VISIT(custom_theme_id);
-  VISIT(custom_theme_update_url);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::TypedUrlSpecifics& proto) {
-  VISIT(url);
-  VISIT(title);
-  VISIT(hidden);
-  VISIT_REP(visits);
-  VISIT_REP(visit_transitions);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::UserEventSpecifics& proto) {
-  VISIT(event_time_usec);
-  VISIT(navigation_id);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::WalletMaskedCreditCard& proto) {
-  VISIT(id);
-  VISIT_ENUM(status);
-  VISIT(name_on_card);
-  VISIT_ENUM(type);
-  VISIT(last_four);
-  VISIT(exp_month);
-  VISIT(exp_year);
-  VISIT(billing_address_id);
-  VISIT_ENUM(card_class);
-  VISIT(bank_name);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::WalletPostalAddress& proto) {
-  VISIT(id);
-  VISIT(recipient_name);
-  VISIT(company_name);
-  VISIT_REP(street_address);
-  VISIT(address_1);
-  VISIT(address_2);
-  VISIT(address_3);
-  VISIT(address_4);
-  VISIT(postal_code);
-  VISIT(sorting_code);
-  VISIT(country_code);
-  VISIT(phone_number);
-  VISIT(language_code);
+VISIT_PROTO_FIELDS(const sync_pb::SessionTab& proto) {
+  VISIT(tab_id);
+  VISIT(window_id);
+  VISIT(tab_visual_index);
+  VISIT(current_navigation_index);
+  VISIT(pinned);
+  VISIT(extension_app_id);
+  VISIT_REP(navigation);
+  VISIT_BYTES(favicon);
+  VISIT_ENUM(favicon_type);
+  VISIT(favicon_source);
+  VISIT_REP(variation_id);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::WifiCredentialSpecifics& proto) {
-  VISIT_BYTES(ssid);
-  VISIT_ENUM(security_class);
-  VISIT_BYTES(passphrase);
+VISIT_PROTO_FIELDS(const sync_pb::SessionWindow& proto) {
+  VISIT(window_id);
+  VISIT(selected_tab_index);
+  VISIT_REP(tab);
+  VISIT_ENUM(browser_type);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::EntitySpecifics& proto) {
-  VISIT(encrypted);
-  VISIT(app);
-  VISIT(app_list);
-  VISIT(app_notification);
-  VISIT(app_setting);
-  VISIT(arc_package);
-  VISIT(article);
-  VISIT(autofill);
-  VISIT(autofill_profile);
-  VISIT(autofill_wallet);
-  VISIT(bookmark);
-  VISIT(device_info);
-  VISIT(dictionary);
-  VISIT(experiments);
-  VISIT(extension);
-  VISIT(extension_setting);
-  VISIT(favicon_image);
-  VISIT(favicon_tracking);
-  VISIT(history_delete_directive);
-  VISIT(managed_user);
-  VISIT(managed_user_setting);
-  VISIT(managed_user_shared_setting);
-  VISIT(managed_user_whitelist);
-  VISIT(nigori);
-  VISIT(password);
-  VISIT(preference);
-  VISIT(printer);
-  VISIT(priority_preference);
-  VISIT(reading_list);
-  VISIT(search_engine);
-  VISIT(session);
-  VISIT(synced_notification);
-  VISIT(synced_notification_app_info);
-  VISIT(theme);
-  VISIT(typed_url);
-  VISIT(user_event);
-  VISIT(wallet_metadata);
-  VISIT(wifi_credential);
+VISIT_PROTO_FIELDS(const sync_pb::SourceInfo& proto) {
+  VISIT_ENUM(source);
+  VISIT_REP(type_hint);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::SyncEntity::BookmarkData& proto) {
-  VISIT(bookmark_folder);
-  VISIT(bookmark_url);
-  VISIT(bookmark_favicon);
+VISIT_PROTO_FIELDS(const sync_pb::SyncCycleCompletedEventInfo& proto) {
+  VISIT(num_encryption_conflicts);
+  VISIT(num_hierarchy_conflicts);
+  VISIT(num_server_conflicts);
+  VISIT(num_updates_downloaded);
+  VISIT(num_reflected_updates_downloaded);
+  VISIT(caller_info);
+  VISIT_REP(source_info);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::SyncEntity& proto) {
@@ -678,223 +775,127 @@ VISIT_PROTO_FIELDS(const sync_pb::SyncEntity& proto) {
   VISIT(bookmarkdata);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ChromiumExtensionsActivity& proto) {
-  VISIT(extension_id);
-  VISIT(bookmark_writes_since_last_commit);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::CommitMessage& proto) {
-  VISIT_REP(entries);
-  VISIT(cache_guid);
-  VISIT_REP(extensions_activity);
-  VISIT(config_params);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::GetUpdateTriggers& proto) {
-  VISIT_REP(notification_hint);
-  VISIT(client_dropped_hints);
-  VISIT(invalidations_out_of_sync);
-  VISIT(local_modification_nudges);
-  VISIT(datatype_refresh_nudges);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::DataTypeProgressMarker& proto) {
-  VISIT(data_type_id);
-  VISIT_BYTES(token);
-  VISIT(timestamp_token_for_migration);
-  VISIT(notification_hint);
-  VISIT(get_update_triggers);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::DataTypeContext& proto) {
-  VISIT(data_type_id);
-  VISIT(context);
-  VISIT(version);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::GetUpdatesCallerInfo& proto) {
-  VISIT_ENUM(source);
-  VISIT(notifications_enabled);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::GetUpdatesMessage& proto) {
-  VISIT(caller_info);
-  VISIT(fetch_folders);
-  VISIT(batch_size);
-  VISIT_REP(from_progress_marker);
-  VISIT(streaming);
-  VISIT(need_encryption_key);
-  VISIT(create_mobile_bookmarks_folder);
-  VISIT_ENUM(get_updates_origin);
-  VISIT_REP(client_contexts);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::ClientStatus& proto) {
-  VISIT(hierarchy_conflict_detected);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::CommitResponse::EntryResponse& proto) {
-  VISIT_ENUM(response_type);
-  VISIT(id_string);
-  VISIT(parent_id_string);
-  VISIT(position_in_parent);
-  VISIT(version);
-  VISIT(name);
-  VISIT(error_message);
-  VISIT(mtime);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::CommitResponse& proto) {
-  VISIT_REP(entryresponse);
+VISIT_PROTO_FIELDS(const sync_pb::SyncEntity::BookmarkData& proto) {
+  VISIT(bookmark_folder);
+  VISIT(bookmark_url);
+  VISIT(bookmark_favicon);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::GetUpdatesResponse& proto) {
-  VISIT_REP(entries)
-  VISIT(changes_remaining);
-  VISIT_REP(new_progress_marker);
-  VISIT_REP(context_mutations);
-}
+VISIT_PROTO_FIELDS(const sync_pb::SyncedNotificationAppInfoSpecifics& proto) {}
 
-VISIT_PROTO_FIELDS(const sync_pb::ClientCommand& proto) {
-  VISIT(set_sync_poll_interval);
-  VISIT(set_sync_long_poll_interval);
-  VISIT(max_commit_batch_size);
-  VISIT(sessions_commit_delay_seconds);
-  VISIT(throttle_delay_seconds);
-  VISIT(client_invalidation_hint_buffer_size);
-}
+VISIT_PROTO_FIELDS(const sync_pb::SyncedNotificationSpecifics& proto) {}
 
-VISIT_PROTO_FIELDS(const sync_pb::ClientToServerResponse::Error& proto) {
-  VISIT_ENUM(error_type);
-  VISIT(error_description);
-  VISIT(url);
-  VISIT_ENUM(action);
+VISIT_PROTO_FIELDS(const sync_pb::TabNavigation& proto) {
+  VISIT(virtual_url);
+  VISIT(referrer);
+  VISIT(title);
+  VISIT_ENUM(page_transition);
+  VISIT_ENUM(redirect_type);
+  VISIT(unique_id);
+  VISIT(timestamp_msec);
+  VISIT(navigation_forward_back);
+  VISIT(navigation_from_address_bar);
+  VISIT(navigation_home_page);
+  VISIT(navigation_chain_start);
+  VISIT(navigation_chain_end);
+  VISIT(global_id);
+  VISIT(search_terms);
+  VISIT(favicon_url);
+  VISIT_ENUM(blocked_state);
+  VISIT_REP(content_pack_categories);
+  VISIT(http_status_code);
+  VISIT(obsolete_referrer_policy);
+  VISIT(is_restored);
+  VISIT_REP(navigation_redirect);
+  VISIT(last_navigation_redirect_url);
+  VISIT(correct_referrer_policy);
+  VISIT_ENUM(password_state);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ClientToServerResponse& proto) {
-  VISIT(commit);
-  VISIT(get_updates);
-  VISIT(error);
-  VISIT_ENUM(error_code);
-  VISIT(error_message);
-  VISIT(store_birthday);
-  VISIT(client_command);
-  VISIT_REP(migrated_data_type_id);
+VISIT_PROTO_FIELDS(const sync_pb::ThemeSpecifics& proto) {
+  VISIT(use_custom_theme);
+  VISIT(use_system_theme_by_default);
+  VISIT(custom_theme_name);
+  VISIT(custom_theme_id);
+  VISIT(custom_theme_update_url);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ClientToServerMessage& proto) {
-  VISIT(share);
-  VISIT(protocol_version);
-  VISIT(commit);
-  VISIT(get_updates);
-  VISIT(store_birthday);
-  VISIT(sync_problem_detected);
-  VISIT(debug_info);
-  VISIT(client_status);
+VISIT_PROTO_FIELDS(const sync_pb::TimeRangeDirective& proto) {
+  VISIT(start_time_usec);
+  VISIT(end_time_usec);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::DatatypeAssociationStats& proto) {
+VISIT_PROTO_FIELDS(const sync_pb::TypeHint& proto) {
   VISIT(data_type_id);
-  VISIT(num_local_items_before_association);
-  VISIT(num_sync_items_before_association);
-  VISIT(num_local_items_after_association);
-  VISIT(num_sync_items_after_association);
-  VISIT(num_local_items_added);
-  VISIT(num_local_items_deleted);
-  VISIT(num_local_items_modified);
-  VISIT(num_sync_items_added);
-  VISIT(num_sync_items_deleted);
-  VISIT(num_sync_items_modified);
-  VISIT(local_version_pre_association);
-  VISIT(sync_version_pre_association);
-  VISIT(had_error);
-  VISIT(download_wait_time_us);
-  VISIT(download_time_us);
-  VISIT(association_wait_time_for_high_priority_us);
-  VISIT(association_wait_time_for_same_priority_us);
-  VISIT_REP(high_priority_type_configured_before);
-  VISIT_REP(same_priority_type_configured_before);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::DebugEventInfo& proto) {
-  VISIT_ENUM(singleton_event);
-  VISIT(sync_cycle_completed_event_info);
-  VISIT(nudging_datatype);
-  VISIT_REP(datatypes_notified_from_server);
-  VISIT(datatype_association_stats);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::DebugInfo& proto) {
-  VISIT_REP(events);
-  VISIT(cryptographer_ready);
-  VISIT(cryptographer_has_pending_keys);
-  VISIT(events_dropped);
+  VISIT(has_valid_hint);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::SyncCycleCompletedEventInfo& proto) {
-  VISIT(num_encryption_conflicts);
-  VISIT(num_hierarchy_conflicts);
-  VISIT(num_server_conflicts);
-  VISIT(num_updates_downloaded);
-  VISIT(num_reflected_updates_downloaded);
-  VISIT(caller_info);
-  VISIT_REP(source_info);
+VISIT_PROTO_FIELDS(const sync_pb::TypedUrlSpecifics& proto) {
+  VISIT(url);
+  VISIT(title);
+  VISIT(hidden);
+  VISIT_REP(visits);
+  VISIT_REP(visit_transitions);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ClientConfigParams& proto) {
-  VISIT_REP(enabled_type_ids);
-  VISIT(tabs_datatype_enabled);
-  VISIT(cookie_jar_mismatch);
+VISIT_PROTO_FIELDS(const sync_pb::UniquePosition& proto) {
+  VISIT_BYTES(value);
+  VISIT_BYTES(compressed_value);
+  VISIT(uncompressed_length);
+  VISIT_BYTES(custom_compressed_v1);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::AttachmentIdProto& proto) {
-  VISIT(unique_id);
+VISIT_PROTO_FIELDS(const sync_pb::UserEventSpecifics& proto) {
+  VISIT(event_time_usec);
+  VISIT(navigation_id);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::AttachmentMetadataRecord& proto) {
+VISIT_PROTO_FIELDS(const sync_pb::WalletMaskedCreditCard& proto) {
   VISIT(id);
-  VISIT(is_on_server);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::AttachmentMetadata& proto) {
-  VISIT_REP(record);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::ModelTypeState& proto) {
-  VISIT(progress_marker);
-  VISIT(type_context);
-  VISIT(encryption_key_name);
-  VISIT(initial_sync_done);
+  VISIT_ENUM(status);
+  VISIT(name_on_card);
+  VISIT_ENUM(type);
+  VISIT(last_four);
+  VISIT(exp_month);
+  VISIT(exp_year);
+  VISIT(billing_address_id);
+  VISIT_ENUM(card_class);
+  VISIT(bank_name);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::EntityMetadata& proto) {
-  VISIT(client_tag_hash);
-  VISIT(server_id);
-  VISIT(is_deleted);
-  VISIT(sequence_number);
-  VISIT(acked_sequence_number);
-  VISIT(server_version);
-  VISIT(creation_time);
-  VISIT(modification_time);
-  VISIT(specifics_hash);
-  VISIT(base_specifics_hash);
+VISIT_PROTO_FIELDS(const sync_pb::WalletMetadataSpecifics& proto) {
+  VISIT_ENUM(type);
+  VISIT(id);
+  VISIT(use_count);
+  VISIT(use_date);
+  VISIT(card_billing_address_id);
+  VISIT(address_has_converted);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::UniquePosition& proto) {
-  VISIT_BYTES(value);
-  VISIT_BYTES(compressed_value);
-  VISIT(uncompressed_length);
-  VISIT_BYTES(custom_compressed_v1);
+VISIT_PROTO_FIELDS(const sync_pb::WalletPostalAddress& proto) {
+  VISIT(id);
+  VISIT(recipient_name);
+  VISIT(company_name);
+  VISIT_REP(street_address);
+  VISIT(address_1);
+  VISIT(address_2);
+  VISIT(address_3);
+  VISIT(address_4);
+  VISIT(postal_code);
+  VISIT(sorting_code);
+  VISIT(country_code);
+  VISIT(phone_number);
+  VISIT(language_code);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::TypeHint& proto) {
-  VISIT(data_type_id);
-  VISIT(has_valid_hint);
+VISIT_PROTO_FIELDS(const sync_pb::WalletSyncFlags& proto) {
+  VISIT(enabled);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::SourceInfo& proto) {
-  VISIT_ENUM(source);
-  VISIT_REP(type_hint);
+VISIT_PROTO_FIELDS(const sync_pb::WifiCredentialSpecifics& proto) {
+  VISIT_BYTES(ssid);
+  VISIT_ENUM(security_class);
+  VISIT_BYTES(passphrase);
 }
 
 }  // namespace syncer