Change behaivor to decide whether a search engine should be shown in the default list

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 a5634f1ce7c35917e50db2dfe73b9c3ea8b144dd..e0ea6e4106782621901af56aff905f012235ef64 100644
--- a/components/sync/protocol/proto_visitors.h
+++ b/components/sync/protocol/proto_visitors.h
@@ -77,21 +77,25 @@
 
 namespace syncer {
 
+// Add NOLINT(runtime/references) to all the functions to skip presubmit warning
+// of making V& visitor const. Making V& visitor const will cause errors for

[Ian Wen, 2016/11/09 19:58:52]

Remove "Making V&...".

Reference and const reference are totally two different types, and it shouldn't
surprise anyone if they are incompatible.

[ltian, 2016/11/11 03:52:13]

Done.

+// compilation.
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::EncryptedData& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)

[Peter Kasting, 2016/11/10 06:41:07]

Nit: Perhaps we should do something like:

#define VISIT_PROTO_FIELDS(proto) \
template <class V> \
void VisitProtoFields(V& visitor, proto)  // NOLINT(runtime/references)

...

VISIT_PROTO_FIELDS(const sync_pb::EncryptedData& proto) {
  ...

This avoids the nasty NOLINTs in most places and makes the file shorter to boot.

(Might not even need the NOLINT now, I dunno.)

[ltian, 2016/11/11 03:52:13]

This is a more decent solution! Thanks!

+                      const sync_pb::EncryptedData& proto) {
   VISIT(key_name);
   // TODO(akalin): Shouldn't blob be of type bytes instead of string?
   VISIT_BYTES(blob);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::PasswordSpecificsMetadata& proto) {
   VISIT(url);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::AppNotificationSettings& proto) {
   VISIT(initial_setup_done);
   VISIT(disabled);
@@ -99,14 +103,16 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::SessionHeader& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::SessionHeader& proto) {
   VISIT_REP(window);
   VISIT(client_name);
   VISIT_ENUM(device_type);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::SessionTab& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::SessionTab& proto) {
   VISIT(tab_id);
   VISIT(window_id);
   VISIT(tab_visual_index);
@@ -121,7 +127,8 @@ void VisitProtoFields(V& visitor, const sync_pb::SessionTab& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::SessionWindow& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::SessionWindow& proto) {
   VISIT(window_id);
   VISIT(selected_tab_index);
   VISIT_REP(tab);
@@ -129,7 +136,8 @@ void VisitProtoFields(V& visitor, const sync_pb::SessionWindow& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::TabNavigation& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::TabNavigation& proto) {
   VISIT(virtual_url);
   VISIT(referrer);
   VISIT(title);
@@ -157,12 +165,14 @@ void VisitProtoFields(V& visitor, const sync_pb::TabNavigation& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::NavigationRedirect& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::NavigationRedirect& proto) {
   VISIT(url);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::PasswordSpecificsData& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::PasswordSpecificsData& proto) {
   VISIT(scheme);
   VISIT(signon_realm);
   VISIT(origin);
@@ -181,20 +191,23 @@ void VisitProtoFields(V& visitor, const sync_pb::PasswordSpecificsData& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::GlobalIdDirective& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::GlobalIdDirective& proto) {
   VISIT_REP(global_id);
   VISIT(start_time_usec);
   VISIT(end_time_usec);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::TimeRangeDirective& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::TimeRangeDirective& proto) {
   VISIT(start_time_usec);
   VISIT(end_time_usec);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::AppListSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::AppListSpecifics& proto) {
   VISIT(item_id);
   VISIT_ENUM(item_type);
   VISIT(item_name);
@@ -204,7 +217,8 @@ void VisitProtoFields(V& visitor, const sync_pb::AppListSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ArcPackageSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ArcPackageSpecifics& proto) {
   VISIT(package_name);
   VISIT(package_version);
   VISIT(last_backup_android_id);
@@ -212,14 +226,16 @@ void VisitProtoFields(V& visitor, const sync_pb::ArcPackageSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::PrinterPPDReference& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::PrinterPPDReference& proto) {
   VISIT(user_supplied_ppd_url);
   VISIT(effective_manufacturer);
   VISIT(effective_model);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ReadingListSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ReadingListSpecifics& proto) {
   VISIT(entry_id);
   VISIT(title);
   VISIT(url);
@@ -229,7 +245,8 @@ void VisitProtoFields(V& visitor, const sync_pb::ReadingListSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::AppNotification& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::AppNotification& proto) {
   VISIT(guid);
   VISIT(app_id);
   VISIT(creation_timestamp_ms);
@@ -240,18 +257,21 @@ void VisitProtoFields(V& visitor, const sync_pb::AppNotification& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::AppSettingSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::AppSettingSpecifics& proto) {
   VISIT(extension_setting);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::LinkedAppIconInfo& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::LinkedAppIconInfo& proto) {
   VISIT(url);
   VISIT(size);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::AppSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::AppSpecifics& proto) {
   VISIT(extension);
   VISIT(notification_settings);
   VISIT(app_launch_ordinal);
@@ -261,11 +281,11 @@ void VisitProtoFields(V& visitor, const sync_pb::AppSpecifics& proto) {
   VISIT(bookmark_app_description);
   VISIT(bookmark_app_icon_color);
   VISIT_REP(linked_app_icons);
-
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::AutofillSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::AutofillSpecifics& proto) {
   VISIT(name);
   VISIT(value);
   VISIT_REP(usage_timestamp);
@@ -273,7 +293,7 @@ void VisitProtoFields(V& visitor, const sync_pb::AutofillSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::AutofillProfileSpecifics& proto) {
   VISIT(guid);
   VISIT(origin);
@@ -299,7 +319,7 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::WalletMetadataSpecifics& proto) {
   VISIT_ENUM(type);
   VISIT(id);
@@ -308,7 +328,7 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::AutofillWalletSpecifics& proto) {
   VISIT_ENUM(type);
   VISIT(masked_card);
@@ -316,13 +336,15 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::MetaInfo& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::MetaInfo& proto) {
   VISIT(key);
   VISIT(value);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::BookmarkSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::BookmarkSpecifics& proto) {
   VISIT(url);
   VISIT_BYTES(favicon);
   VISIT(title);
@@ -332,7 +354,8 @@ void VisitProtoFields(V& visitor, const sync_pb::BookmarkSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::DeviceInfoSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::DeviceInfoSpecifics& proto) {
   VISIT(cache_guid);
   VISIT(client_name);
   VISIT_ENUM(device_type);
@@ -342,51 +365,57 @@ void VisitProtoFields(V& visitor, const sync_pb::DeviceInfoSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::DictionarySpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::DictionarySpecifics& proto) {
   VISIT(word);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::FaviconSyncFlags& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::FaviconSyncFlags& proto) {
   VISIT(enabled);
   VISIT(favicon_sync_limit);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::KeystoreEncryptionFlags& proto) {
   VISIT(enabled);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::HistoryDeleteDirectives& proto) {
   VISIT(enabled);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::AutofillCullingFlags& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::AutofillCullingFlags& proto) {
   VISIT(enabled);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::PreCommitUpdateAvoidanceFlags& proto) {
   VISIT(enabled);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::GcmChannelFlags& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::GcmChannelFlags& proto) {
   VISIT(enabled);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::GcmInvalidationsFlags& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::GcmInvalidationsFlags& proto) {
   VISIT(enabled);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ExperimentsSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ExperimentsSpecifics& proto) {
   VISIT(keystore_encryption);
   VISIT(history_delete_directives);
   VISIT(autofill_culling);
@@ -397,7 +426,7 @@ void VisitProtoFields(V& visitor, const sync_pb::ExperimentsSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::ExtensionSettingSpecifics& proto) {
   VISIT(extension_id);
   VISIT(key);
@@ -405,7 +434,8 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ExtensionSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ExtensionSpecifics& proto) {
   VISIT(id);
   VISIT(version);
   VISIT(update_url);
@@ -419,14 +449,16 @@ void VisitProtoFields(V& visitor, const sync_pb::ExtensionSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::FaviconData& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::FaviconData& proto) {
   VISIT_BYTES(favicon);
   VISIT(width);
   VISIT(height);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::FaviconImageSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::FaviconImageSpecifics& proto) {
   VISIT(favicon_url);
   VISIT(favicon_web);
   VISIT(favicon_web_32);
@@ -435,7 +467,7 @@ void VisitProtoFields(V& visitor, const sync_pb::FaviconImageSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::FaviconTrackingSpecifics& proto) {
   VISIT(favicon_url);
   VISIT(last_visit_time_ms);
@@ -443,21 +475,22 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::HistoryDeleteDirectiveSpecifics& proto) {
   VISIT(global_id_directive);
   VISIT(time_range_directive);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::ManagedUserSettingSpecifics& proto) {
   VISIT(name);
   VISIT(value);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ManagedUserSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ManagedUserSpecifics& proto) {
   VISIT(id);
   VISIT(name);
   VISIT(acknowledged);
@@ -467,7 +500,7 @@ void VisitProtoFields(V& visitor, const sync_pb::ManagedUserSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::ManagedUserSharedSettingSpecifics& proto) {
   VISIT(mu_id);
   VISIT(key);
@@ -476,14 +509,15 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::ManagedUserWhitelistSpecifics& proto) {
   VISIT(id);
   VISIT(name);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::NigoriSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::NigoriSpecifics& proto) {
   VISIT(encryption_keybag);
   VISIT(keybag_is_frozen);
   VISIT(encrypt_bookmarks);
@@ -513,31 +547,36 @@ void VisitProtoFields(V& visitor, const sync_pb::NigoriSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ArticlePage& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ArticlePage& proto) {
   VISIT(url);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ArticleSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ArticleSpecifics& proto) {
   VISIT(entry_id);
   VISIT(title);
   VISIT_REP(pages);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::PasswordSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::PasswordSpecifics& proto) {
   VISIT(encrypted);
   VISIT(unencrypted_metadata);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::PreferenceSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::PreferenceSpecifics& proto) {
   VISIT(name);
   VISIT(value);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::PrinterSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::PrinterSpecifics& proto) {
   VISIT(id);
   VISIT(display_name);
   VISIT(description);
@@ -549,24 +588,23 @@ void VisitProtoFields(V& visitor, const sync_pb::PrinterSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::PriorityPreferenceSpecifics& proto) {
   VISIT(preference);
 }
 
 template <class V>
 void VisitProtoFields(
-    V& visitor,
-    const sync_pb::SyncedNotificationAppInfoSpecifics& proto) {
-}
+    V& visitor,  // NOLINT(runtime/references)
+    const sync_pb::SyncedNotificationAppInfoSpecifics& proto) {}
 
 template <class V>
-void VisitProtoFields(V& visitor,
-                      const sync_pb::SyncedNotificationSpecifics& proto) {
-}
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::SyncedNotificationSpecifics& proto) {}
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::SearchEngineSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::SearchEngineSpecifics& proto) {
   VISIT(short_name);
   VISIT(keyword);
   VISIT(favicon_url);
@@ -575,7 +613,6 @@ void VisitProtoFields(V& visitor, const sync_pb::SearchEngineSpecifics& proto) {
   VISIT(originating_url);
   VISIT(date_created);
   VISIT(input_encodings);
-  VISIT(show_in_default_list);
   VISIT(suggestions_url);
   VISIT(prepopulate_id);
   VISIT(autogenerate_keyword);
@@ -593,7 +630,8 @@ void VisitProtoFields(V& visitor, const sync_pb::SearchEngineSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::SessionSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::SessionSpecifics& proto) {
   VISIT(session_tag);
   VISIT(header);
   VISIT(tab);
@@ -601,7 +639,8 @@ void VisitProtoFields(V& visitor, const sync_pb::SessionSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ThemeSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ThemeSpecifics& proto) {
   VISIT(use_custom_theme);
   VISIT(use_system_theme_by_default);
   VISIT(custom_theme_name);
@@ -610,7 +649,8 @@ void VisitProtoFields(V& visitor, const sync_pb::ThemeSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::TypedUrlSpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::TypedUrlSpecifics& proto) {
   VISIT(url);
   VISIT(title);
   VISIT(hidden);
@@ -619,7 +659,7 @@ void VisitProtoFields(V& visitor, const sync_pb::TypedUrlSpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::WalletMaskedCreditCard& proto) {
   VISIT(id);
   VISIT_ENUM(status);
@@ -632,7 +672,8 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::WalletPostalAddress& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::WalletPostalAddress& proto) {
   VISIT(id);
   VISIT(recipient_name);
   VISIT(company_name);
@@ -649,7 +690,7 @@ void VisitProtoFields(V& visitor, const sync_pb::WalletPostalAddress& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::WifiCredentialSpecifics& proto) {
   VISIT_BYTES(ssid);
   VISIT_ENUM(security_class);
@@ -657,7 +698,8 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::EntitySpecifics& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::EntitySpecifics& proto) {
   VISIT(app);
   VISIT(app_list);
   VISIT(app_notification);
@@ -697,7 +739,8 @@ void VisitProtoFields(V& visitor, const sync_pb::EntitySpecifics& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::SyncEntity& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::SyncEntity& proto) {
   VISIT(id_string);
   VISIT(parent_id_string);
   VISIT(old_parent_id);
@@ -721,14 +764,15 @@ void VisitProtoFields(V& visitor, const sync_pb::SyncEntity& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::ChromiumExtensionsActivity& proto) {
   VISIT(extension_id);
   VISIT(bookmark_writes_since_last_commit);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::CommitMessage& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::CommitMessage& proto) {
   VISIT_REP(entries);
   VISIT(cache_guid);
   VISIT_REP(extensions_activity);
@@ -736,7 +780,8 @@ void VisitProtoFields(V& visitor, const sync_pb::CommitMessage& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::GetUpdateTriggers& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::GetUpdateTriggers& proto) {
   VISIT_REP(notification_hint);
   VISIT(client_dropped_hints);
   VISIT(invalidations_out_of_sync);
@@ -745,7 +790,7 @@ void VisitProtoFields(V& visitor, const sync_pb::GetUpdateTriggers& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::DataTypeProgressMarker& proto) {
   VISIT(data_type_id);
   VISIT_BYTES(token);
@@ -755,20 +800,23 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::DataTypeContext& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::DataTypeContext& proto) {
   VISIT(data_type_id);
   VISIT(context);
   VISIT(version);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::GetUpdatesCallerInfo& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::GetUpdatesCallerInfo& proto) {
   VISIT_ENUM(source);
   VISIT(notifications_enabled);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::GetUpdatesMessage& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::GetUpdatesMessage& proto) {
   VISIT(caller_info);
   VISIT(fetch_folders);
   VISIT(batch_size);
@@ -781,12 +829,13 @@ void VisitProtoFields(V& visitor, const sync_pb::GetUpdatesMessage& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ClientStatus& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ClientStatus& proto) {
   VISIT(hierarchy_conflict_detected);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::CommitResponse::EntryResponse& proto) {
   VISIT_ENUM(response_type);
   VISIT(id_string);
@@ -799,12 +848,14 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::CommitResponse& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::CommitResponse& proto) {
   VISIT_REP(entryresponse);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::GetUpdatesResponse& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::GetUpdatesResponse& proto) {
   VISIT_REP(entries)
   VISIT(changes_remaining);
   VISIT_REP(new_progress_marker);
@@ -812,7 +863,8 @@ void VisitProtoFields(V& visitor, const sync_pb::GetUpdatesResponse& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ClientCommand& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ClientCommand& proto) {
   VISIT(set_sync_poll_interval);
   VISIT(set_sync_long_poll_interval);
   VISIT(max_commit_batch_size);
@@ -822,7 +874,7 @@ void VisitProtoFields(V& visitor, const sync_pb::ClientCommand& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::ClientToServerResponse::Error& proto) {
   VISIT_ENUM(error_type);
   VISIT(error_description);
@@ -831,7 +883,7 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::ClientToServerResponse& proto) {
   VISIT(commit);
   VISIT(get_updates);
@@ -844,7 +896,8 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ClientToServerMessage& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ClientToServerMessage& proto) {
   VISIT(share);
   VISIT(protocol_version);
   VISIT(commit);
@@ -856,7 +909,7 @@ void VisitProtoFields(V& visitor, const sync_pb::ClientToServerMessage& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::DatatypeAssociationStats& proto) {
   VISIT(data_type_id);
   VISIT(num_local_items_before_association);
@@ -879,7 +932,8 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::DebugEventInfo& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::DebugEventInfo& proto) {
   VISIT_ENUM(singleton_event);
   VISIT(sync_cycle_completed_event_info);
   VISIT(nudging_datatype);
@@ -888,7 +942,8 @@ void VisitProtoFields(V& visitor, const sync_pb::DebugEventInfo& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::DebugInfo& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::DebugInfo& proto) {
   VISIT_REP(events);
   VISIT(cryptographer_ready);
   VISIT(cryptographer_has_pending_keys);
@@ -896,7 +951,7 @@ void VisitProtoFields(V& visitor, const sync_pb::DebugInfo& proto) {
 }
 
 template <class V>
-void VisitProtoFields(V& visitor,
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
                       const sync_pb::SyncCycleCompletedEventInfo& proto) {
   VISIT(num_encryption_conflicts);
   VISIT(num_hierarchy_conflicts);
@@ -907,19 +962,22 @@ void VisitProtoFields(V& visitor,
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::ClientConfigParams& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::ClientConfigParams& proto) {
   VISIT_REP(enabled_type_ids);
   VISIT(tabs_datatype_enabled);
   VISIT(cookie_jar_mismatch);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::AttachmentIdProto& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::AttachmentIdProto& proto) {
   VISIT(unique_id);
 }
 
 template <class V>
-void VisitProtoFields(V& visitor, const sync_pb::EntityMetadata& proto) {
+void VisitProtoFields(V& visitor,  // NOLINT(runtime/references)
+                      const sync_pb::EntityMetadata& proto) {
   VISIT(client_tag_hash);
   VISIT(server_id);
   VISIT(is_deleted);