[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 10 matching lines @@
 
 DirectoryCommitContribution::~DirectoryCommitContribution() {
   DCHECK(!syncing_bits_set_);
 }
 
 // static.
 std::unique_ptr<DirectoryCommitContribution> DirectoryCommitContribution::Build(
     syncable::Directory* dir,
     ModelType type,
     size_t max_entries,
-    DirectoryTypeDebugInfoEmitter* debug_info_emitter) {
+    DataTypeDebugInfoEmitter* debug_info_emitter) {
   DCHECK(debug_info_emitter);
 
   std::vector<int64_t> metahandles;
 
   syncable::ModelNeutralWriteTransaction trans(FROM_HERE, SYNCER, dir);
   GetCommitIdsForType(&trans, type, max_entries, &metahandles);
 
   if (metahandles.empty())
     return std::unique_ptr<DirectoryCommitContribution>();
 
@@ skipping 72 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 23 matching lines @@
 
 size_t DirectoryCommitContribution::GetNumEntries() const {
   return metahandles_.size();
 }
 
 DirectoryCommitContribution::DirectoryCommitContribution(
     const std::vector<int64_t>& metahandles,
     const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity>& entities,
     const sync_pb::DataTypeContext& context,
     syncable::Directory* dir,
-    DirectoryTypeDebugInfoEmitter* debug_info_emitter)
+    DataTypeDebugInfoEmitter* debug_info_emitter)
     : dir_(dir),
       metahandles_(metahandles),
       entities_(entities),
       context_(context),
       entries_start_index_(0xDEADBEEF),
       syncing_bits_set_(true),
       debug_info_emitter_(debug_info_emitter) {}
 
 void DirectoryCommitContribution::UnsetSyncingBits() {
   syncable::ModelNeutralWriteTransaction trans(FROM_HERE, SYNCER, dir_);
   for (std::vector<int64_t>::const_iterator it = metahandles_.begin();
        it != metahandles_.end(); ++it) {
     syncable::ModelNeutralMutableEntry entry(&trans, GET_BY_HANDLE, *it);
     // TODO(sync): this seems like it could be harmful if a sync cycle doesn't
     // 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