| Index: components/sync/protocol/proto_visitors.h
|
| diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h
|
| index a4a96721235720a5cafc16a948a62a25878aecd3..38f162a2f9d1ed6a2eecfd5e6aa94fb4f164168f 100644
|
| --- a/components/sync/protocol/proto_visitors.h
|
| +++ b/components/sync/protocol/proto_visitors.h
|
| @@ -472,13 +472,13 @@ VISIT_PROTO_FIELDS(const sync_pb::FaviconTrackingSpecifics& proto) {
|
| VISIT(is_bookmarked);
|
| }
|
|
|
| -VISIT_PROTO_FIELDS(const sync_pb::FieldTrialEvent::FieldTrial& proto) {
|
| +VISIT_PROTO_FIELDS(const sync_pb::FieldTrial::FieldTrialPair& proto) {
|
| VISIT(name_id);
|
| VISIT(group_id);
|
| }
|
|
|
| -VISIT_PROTO_FIELDS(const sync_pb::FieldTrialEvent& proto) {
|
| - VISIT_REP(field_trials);
|
| +VISIT_PROTO_FIELDS(const sync_pb::FieldTrial& proto) {
|
| + VISIT_REP(field_trial_pairs);
|
| }
|
|
|
| VISIT_PROTO_FIELDS(const sync_pb::GcmChannelFlags& proto) {
|
| @@ -877,10 +877,10 @@ VISIT_PROTO_FIELDS(const sync_pb::UserEventSpecifics& proto) {
|
| VISIT(event_time_usec);
|
| VISIT(navigation_id);
|
| VISIT(session_id);
|
| - VISIT(test);
|
| + VISIT(test_event);
|
| VISIT(field_trial_event);
|
| - VISIT(language_detection);
|
| - VISIT(translation);
|
| + VISIT(language_detection_event);
|
| + VISIT(translation_event);
|
| }
|
|
|
| VISIT_PROTO_FIELDS(const sync_pb::UserEventSpecifics::Test& proto) {}
|
|
|