Merge 144583 - sync: fix reentrancy crash in ModelAssociationManager

chrome/browser/sync/glue/fake_data_type_controller.cc

 // Copyright (c) 2012 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 "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "chrome/browser/sync/glue/fake_data_type_controller.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 56 matching lines @@
     state_ = NOT_RUNNING;
     error.Reset(FROM_HERE, "Fake error", type_);
   }
   last_start_callback_.Run(result, error);
   last_start_callback_.Reset();
 }
 
 // * -> 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 and mock out
+    // unnecessary pieces.
+    SimulateModelLoadFinishing();
+  }
+
   // The DTM still expects |last_start_callback_| to be called back.
   if (!last_start_callback_.is_null()) {
     SyncError error(FROM_HERE, "Fake error", type_);
     last_start_callback_.Run(ABORTED, error);
   }
 }
 
 ModelType FakeDataTypeController::type() const {
   return type_;
 }
@@ skipping 27 matching lines @@
 void FakeDataTypeController::SetDelayModelLoad() {
   model_load_delayed_ = true;
 }
 
 void FakeDataTypeController::SimulateModelLoadFinishing() {
   ModelLoadCallback model_load_callback = model_load_callback_;
   model_load_callback.Run(type(), SyncError());
 }
 
 }  // namespace browser_sync