sync: fix reentrancy crash in ModelAssociationManager

chrome/browser/sync/glue/fake_data_type_controller.cc

Index: chrome/browser/sync/glue/fake_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/fake_data_type_controller.cc b/chrome/browser/sync/glue/fake_data_type_controller.cc
index b228c5d74d855659a78965d2b97dbffbd2773042..1aa3cf264937b0cb41bf394c7e8bdd7b944ca7b2 100644
--- a/chrome/browser/sync/glue/fake_data_type_controller.cc
+++ b/chrome/browser/sync/glue/fake_data_type_controller.cc
@@ -74,6 +74,13 @@ void FakeDataTypeController::FinishStart(StartResult result) {
 // * -> NOT_RUNNING
 void FakeDataTypeController::Stop() {
   state_ = NOT_RUNNING;
+  if (!model_load_callback_.is_null()) {
+    // Real data type controllers run the callback and specify "ABORTED" as an
+    // error.  We should probably find a way to use the real code an mock out

[Nicolas Zea, 2012/06/27 17:52:09]

an -> and

+    // unnecessary pieces.
+    SimulateModelLoadFinishing();
+  }
+
   // The DTM still expects |last_start_callback_| to be called back.
   if (!last_start_callback_.is_null()) {
     csync::SyncError error(FROM_HERE, "Fake error", type_);