[USS] Change the place where SharedModelTypeProcessor got created

sync/api/model_type_service.cc

Index: sync/api/model_type_service.cc
diff --git a/sync/api/model_type_service.cc b/sync/api/model_type_service.cc
index 87df14bf6011dc559b98e90082d0e2d29f1235d7..1f33fb426e38e11bcff978c9f927787956ee1175 100644
--- a/sync/api/model_type_service.cc
+++ b/sync/api/model_type_service.cc
@@ -4,9 +4,13 @@
 
 #include "sync/api/model_type_service.h"
 
+#include "sync/internal_api/public/shared_model_type_processor.h"

[skym, 2016/03/24 16:08:52]

Replace this with correct include.

[Gang Wu, 2016/03/24 22:18:11]

Done.

+
 namespace syncer_v2 {
 
-ModelTypeService::ModelTypeService() {}
+ModelTypeService::ModelTypeService(
+    const ChangeProcessorFactory& change_processor_factory)
+    : change_processor_factory_(change_processor_factory) {}
 
 ModelTypeService::~ModelTypeService() {}
 
@@ -14,15 +18,26 @@ ModelTypeChangeProcessor* ModelTypeService::change_processor() const {
   return change_processor_.get();
 }
 
-void ModelTypeService::set_change_processor(
-    scoped_ptr<ModelTypeChangeProcessor> change_processor) {
-  DCHECK(!change_processor_);
-  change_processor_.swap(change_processor);
-  OnChangeProcessorSet();
+ModelTypeChangeProcessor* ModelTypeService::GetOrCreateChangeProcessor() {
+  if (!change_processor_.get()) {

[skym, 2016/03/24 16:08:52]

I think this .get() is unnecessary.

[Gang Wu, 2016/03/24 22:18:11]

Done.

+    change_processor_.reset(
+        change_processor_factory_.Run(type(), this).release());

[skym, 2016/03/24 16:08:52]

Is there a reason you're not using std::swap anymore? It seems more elegant to
me than this reset/release combo.

[Gang Wu, 2016/03/24 22:18:11]

Done.

+    DCHECK(change_processor_.get());

[skym, 2016/03/24 16:08:52]

I think this .get() in unnecessary.

[Gang Wu, 2016/03/24 22:18:11]

Done.

+    OnChangeProcessorSet();
+  }
+  return change_processor_.get();
 }
 
 void ModelTypeService::clear_change_processor() {
   change_processor_.reset();
 }
 
+ModelTypeChangeProcessor* ModelTypeService::OnSyncStarting(
+    const ModelTypeChangeProcessor::StartCallback& start_callback) {
+  ModelTypeChangeProcessor* processor = GetOrCreateChangeProcessor();
+  DCHECK(processor);
+  processor->OnSyncStarting(start_callback);
+  return processor;
+}
+
 }  // namespace syncer_v2