[USS] Show USS counters in Types tab

components/sync/engine_impl/model_type_registry.h

Index: components/sync/engine_impl/model_type_registry.h
diff --git a/components/sync/engine_impl/model_type_registry.h b/components/sync/engine_impl/model_type_registry.h
index 2e21774783e0c40156e005f9bb374cebf3facd83..2b13fde5b8f02c7211fcb5d49e6dceac361f86d0 100644
--- a/components/sync/engine_impl/model_type_registry.h
+++ b/components/sync/engine_impl/model_type_registry.h
@@ -34,6 +34,7 @@ class Directory;
 }  // namespace syncable
 
 class CommitContributor;
+class DataTypeDebugInfoEmitter;
 class DirectoryCommitContributor;
 class DirectoryUpdateHandler;
 class DirectoryTypeDebugInfoEmitter;

[pavely, 2016/10/19 18:18:59]

This forward declaration is not needed anymore.

[Gang Wu, 2016/10/20 21:35:36]

Done.

@@ -41,8 +42,8 @@ class UpdateHandler;
 
 typedef std::map<ModelType, UpdateHandler*> UpdateHandlerMap;
 typedef std::map<ModelType, CommitContributor*> CommitContributorMap;
-typedef std::map<ModelType, DirectoryTypeDebugInfoEmitter*>
-    DirectoryTypeDebugInfoEmitterMap;
+typedef std::map<ModelType, DataTypeDebugInfoEmitter*>
+    DataTypeDebugInfoEmitterMap;
 
 // Keeps track of the sets of active update handlers and commit contributors.
 class ModelTypeRegistry : public ModelTypeConnector,
@@ -97,7 +98,7 @@ class ModelTypeRegistry : public ModelTypeConnector,
   // Simple getters.
   UpdateHandlerMap* update_handler_map();
   CommitContributorMap* commit_contributor_map();
-  DirectoryTypeDebugInfoEmitterMap* directory_type_debug_info_emitter_map();
+  DataTypeDebugInfoEmitterMap* directory_type_debug_info_emitter_map();

[pavely, 2016/10/19 18:18:59]

I don't think this accessor is used anywhere. Could you check if we can remove
it?

[Gang Wu, 2016/10/20 21:35:36]

Done.

 
   void RegisterDirectoryTypeDebugInfoObserver(TypeDebugInfoObserver* observer);
   void UnregisterDirectoryTypeDebugInfoObserver(
@@ -117,8 +118,7 @@ class ModelTypeRegistry : public ModelTypeConnector,
   // Sets of handlers and contributors.
   ScopedVector<DirectoryCommitContributor> directory_commit_contributors_;
   ScopedVector<DirectoryUpdateHandler> directory_update_handlers_;
-  ScopedVector<DirectoryTypeDebugInfoEmitter>
-      directory_type_debug_info_emitters_;
+  ScopedVector<DataTypeDebugInfoEmitter> data_type_debug_info_emitters_;
 
   ScopedVector<ModelTypeWorker> model_type_workers_;
 
@@ -130,7 +130,7 @@ class ModelTypeRegistry : public ModelTypeConnector,
   // Map of DebugInfoEmitters for directory types.
   // Non-blocking types handle debug info differently.
   // Does not own its contents.
-  DirectoryTypeDebugInfoEmitterMap directory_type_debug_info_emitter_map_;
+  DataTypeDebugInfoEmitterMap data_type_debug_info_emitter_map_;

[pavely, 2016/10/19 18:18:59]

Could you update comment?

[Gang Wu, 2016/10/20 21:35:36]

Done.

 
   // The known ModelSafeWorkers.
   std::map<ModelSafeGroup, scoped_refptr<ModelSafeWorker>> workers_map_;