[Sync] Nest UserEvent message classes within UserEventSpecifics.

components/sync/protocol/proto_visitors.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SYNC_PROTOCOL_PROTO_VISITORS_H_
 #define COMPONENTS_SYNC_PROTOCOL_PROTO_VISITORS_H_
 
 #include "components/sync/protocol/app_list_specifics.pb.h"
 #include "components/sync/protocol/app_notification_specifics.pb.h"
 #include "components/sync/protocol/app_setting_specifics.pb.h"
@@ skipping 454 matching lines @@
   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::FieldTrial::FieldTrialPair& proto) {
+VISIT_PROTO_FIELDS(
+    const sync_pb::UserEventSpecifics::FieldTrial::FieldTrialPair& proto) {
   VISIT(name_id);
   VISIT(group_id);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::FieldTrial& proto) {
+VISIT_PROTO_FIELDS(const sync_pb::UserEventSpecifics::FieldTrial& proto) {
   VISIT_REP(field_trial_pairs);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::GcmChannelFlags& proto) {
   VISIT(enabled);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::GcmInvalidationsFlags& proto) {
   VISIT(enabled);
 }
@@ skipping 42 matching lines @@
 }
 
 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::LanguageDetection::Language& proto) {
+VISIT_PROTO_FIELDS(
+    const sync_pb::UserEventSpecifics::LanguageDetection::Language& proto) {
   VISIT(language_code);
   VISIT(is_reliable);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::LanguageDetection& proto) {
+VISIT_PROTO_FIELDS(
+    const sync_pb::UserEventSpecifics::LanguageDetection& proto) {
   VISIT_REP(detected_languages);
   VISIT(adopted_language_code);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::LinkedAppIconInfo& proto) {
   VISIT(url);
   VISIT(size);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSettingSpecifics& proto) {
@@ skipping 281 matching lines @@
   VISIT(custom_theme_name);
   VISIT(custom_theme_id);
   VISIT(custom_theme_update_url);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::TimeRangeDirective& proto) {
   VISIT(start_time_usec);
   VISIT(end_time_usec);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::Translation& proto) {
+VISIT_PROTO_FIELDS(const sync_pb::UserEventSpecifics::Translation& proto) {
   VISIT(from_language_code);
   VISIT(to_language_code);
   VISIT_ENUM(interaction);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::TypeHint& proto) {
   VISIT(data_type_id);
   VISIT(has_valid_hint);
 }
 
@@ skipping 74 matching lines @@
 
 }  // namespace syncer
 
 #undef VISIT_
 #undef VISIT_BYTES
 #undef VISIT_ENUM
 #undef VISIT
 #undef VISIT_REP
 
 #endif  // COMPONENTS_SYNC_PROTOCOL_PROTO_VISITORS_H_