[USS] Show USS counters in about:sync page

components/sync/driver/model_type_controller.cc

Index: components/sync/driver/model_type_controller.cc
diff --git a/components/sync/driver/model_type_controller.cc b/components/sync/driver/model_type_controller.cc
index 731c7971061e4556af29b5ecf314c738fb8694ee..ae92445ded791e30fe0fd79ef6a24473bdf6a33b 100644
--- a/components/sync/driver/model_type_controller.cc
+++ b/components/sync/driver/model_type_controller.cc
@@ -25,6 +25,50 @@
 
 namespace syncer {
 
+namespace {
+

[maxbogue, 2016/10/06 17:16:32]

You could probably add a GetProcessorFromService() function up here that does
lines 34-46. Then in e.g. CallProcessorGetAllNodes you'd just have:

SharedModelTypeProcessor* processor = GetProcessorFromService(service);
if (processor) {
  processor->GetAllNodes(callback);
}

[Gang Wu, 2016/10/07 03:59:43]

Done.

+// This function should only be run on model thread
+void CallProcessorGetAllNodes(
+    base::WeakPtr<ModelTypeService> service,
+    const ModelTypeController::AllNodesCallback& callback) {
+  if (!service.get()) {
+    LOG(WARNING) << "ModelTypeService destroyed before DTC was stopped.";
+    return;
+  }
+  // TODO(gangwu): Casting should happen "near" where the processor factory has
+  // code that instantiates a new processor.
+  SharedModelTypeProcessor* processor =
+      (SharedModelTypeProcessor*)service->change_processor();
+  if (!processor) {
+    LOG(WARNING)
+        << "SharedModelTypeProcessor destroyed before DTC was stopped.";
+    return;
+  }
+  processor->GetAllNodes(callback);
+}
+
+// This function should only be run on model thread
+void CallProcessorGetStatusCounters(
+    base::WeakPtr<ModelTypeService> service,
+    const ModelTypeController::StatusCountersCallback& callback) {
+  if (!service.get()) {
+    LOG(WARNING) << "ModelTypeService destroyed before DTC was stopped.";
+    return;
+  }
+  // TODO(gangwu): Casting should happen "near" where the processor factory has
+  // code that instantiates a new processor.
+  SharedModelTypeProcessor* processor =
+      (SharedModelTypeProcessor*)service->change_processor();
+  if (!processor) {
+    LOG(WARNING)
+        << "SharedModelTypeProcessor destroyed before DTC was stopped.";
+    return;
+  }
+  processor->GetStatusCounters(callback);
+}
+
+}  // namespace
+
 ModelTypeController::ModelTypeController(
     ModelType type,
     const base::Closure& dump_stack,
@@ -76,14 +120,17 @@ void ModelTypeController::LoadModels(
 void ModelTypeController::GetAllNodes(const AllNodesCallback& callback) {
   base::WeakPtr<ModelTypeService> service =
       sync_client_->GetModelTypeServiceForType(type());
-  // TODO(gangwu): Casting should happen "near" where the processor factory has
-  // code that instantiates a new processor.
-  SharedModelTypeProcessor* processor =
-      static_cast<SharedModelTypeProcessor*>(service->change_processor());
-  model_thread_->PostTask(
-      FROM_HERE, base::Bind(&SharedModelTypeProcessor::GetAllNodes,
-                            base::Unretained(processor),
-                            base::ThreadTaskRunnerHandle::Get(), callback));
+  model_thread_->PostTask(FROM_HERE,
+                          base::Bind(&CallProcessorGetAllNodes, service,
+                                     BindToCurrentThread(callback)));
+}
+
+void ModelTypeController::GetStatusCounters(
+    const StatusCountersCallback& callback) {
+  base::WeakPtr<ModelTypeService> service =
+      sync_client_->GetModelTypeServiceForType(type());
+  model_thread_->PostTask(FROM_HERE, base::Bind(&CallProcessorGetStatusCounters,
+                                                service, callback));
 }
 
 void ModelTypeController::LoadModelsDone(ConfigureResult result,