sync: Follow-up to conflict resolution refactor

sync/protocol/client_debug_info.proto

 // Copyright (c) 2012 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.
 //
 // Common sync protocol for encrypted data.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 option retain_unknown_fields = true;
@@ skipping 13 matching lines @@
   // conflicts.
   //
   // These counters have been deprecated to avoid further confusion.  The newer
   // counters provide more detail and are less buggy.
   optional int32 num_blocking_conflicts = 2 [deprecated = true];
   optional int32 num_non_blocking_conflicts = 3 [deprecated = true];
 
   // 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;
+  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.
   optional int32 num_updates_downloaded = 8;
   optional int32 num_reflected_updates_downloaded = 9;
   optional GetUpdatesCallerInfo caller_info = 10;
 }
 
 message DebugEventInfo {
   // These events are sent by |SyncManager| class. Note: In the code they each
@@ skipping 39 matching lines @@
   // Whether cryptographer is ready to encrypt and decrypt data.
   optional bool cryptographer_ready = 2;
 
   // Cryptographer has pending keys which indicates the correct passphrase
   // has not been provided yet.
   optional bool cryptographer_has_pending_keys = 3;
 
   // Indicates client has dropped some events to save bandwidth.
   optional bool events_dropped = 4;
 }