[USS] Show USS counters in Types tab

components/sync/engine_impl/directory_commit_contribution.cc

 // Copyright 2014 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.
 
 #include "components/sync/engine_impl/directory_commit_contribution.h"
 
 #include <algorithm>
 #include <set>
 
 #include "components/sync/engine/cycle/commit_counters.h"
@@ skipping 103 matching lines @@
           break;
         default:
           LOG(FATAL) << "Bad return from ProcessSingleCommitResponse";
       }
     }
     MarkDeletedChildrenSynced(dir_, &trans, &deleted_folders);
   }
 
   CommitCounters* counters = debug_info_emitter_->GetMutableCommitCounters();
   counters->num_commits_success += successes;
-  counters->num_commits_conflict += transient_error_commits;
+  counters->num_commits_conflict += conflicting_commits;
   counters->num_commits_error += transient_error_commits;
 
   int commit_count = static_cast<int>(metahandles_.size());
   if (commit_count == successes) {
     return SYNCER_OK;
   } else if (error_commits > 0) {
     return SERVER_RETURN_UNKNOWN_ERROR;
   } else if (transient_error_commits > 0) {
     return SERVER_RETURN_TRANSIENT_ERROR;
   } else if (conflicting_commits > 0) {
@@ skipping 48 matching lines @@
     // complete but the Cleanup method is called anyways. It appears these are
     // unset on the assumption that the sync cycle must have finished properly,
     // although that's actually up to the commit response handling logic.
     entry.PutDirtySync(false);
     entry.PutSyncing(false);
   }
   syncing_bits_set_ = false;
 }
 
 }  // namespace syncer