Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: chrome/browser/sync/glue/fake_data_type_controller.cc

Issue 10694168: Revert 146422 - Merge 144583 - sync: fix reentrancy crash in ModelAssociationManager (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync/glue/model_association_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/fake_data_type_controller.cc
===================================================================
--- chrome/browser/sync/glue/fake_data_type_controller.cc (revision 146436)
+++ chrome/browser/sync/glue/fake_data_type_controller.cc (working copy)
@@ -74,13 +74,6 @@
// * -> 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_);
« no previous file with comments | « no previous file | chrome/browser/sync/glue/model_association_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698