| Index: components/sync/protocol/client_debug_info.proto
|
| diff --git a/sync/protocol/client_debug_info.proto b/components/sync/protocol/client_debug_info.proto
|
| similarity index 98%
|
| rename from sync/protocol/client_debug_info.proto
|
| rename to components/sync/protocol/client_debug_info.proto
|
| index 34e53a3f5707891f6a727b35c687095dcf1b1363..bf9d86946e571a09e83b90d3e4e59bfbce63bbbc 100644
|
| --- a/sync/protocol/client_debug_info.proto
|
| +++ b/components/sync/protocol/client_debug_info.proto
|
| @@ -50,7 +50,7 @@ message SyncCycleCompletedEventInfo {
|
| // These new conflict counters replace the ones above.
|
| optional int32 num_encryption_conflicts = 4;
|
| optional int32 num_hierarchy_conflicts = 5;
|
| - optional int32 num_simple_conflicts = 6; // No longer sent since M24.
|
| + optional int32 num_simple_conflicts = 6; // No longer sent since M24.
|
| optional int32 num_server_conflicts = 7;
|
|
|
| // Counts to track the effective usefulness of our GetUpdate requests.
|
|
|