Merge 106373 - Prevent crash by posting a task to call unrecoverable error handler. The task is p...

chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
===================================================================
--- chrome/browser/sync/glue/preference_data_type_controller_unittest.cc	(revision 107252)
+++ chrome/browser/sync/glue/preference_data_type_controller_unittest.cc	(working copy)
@@ -70,6 +70,10 @@
     EXPECT_CALL(*model_associator_, DisassociateModels(_));
   }
 
+  void PumpLoop() {
+    message_loop_.RunAllPending();
+  }
+
   MessageLoopForUI message_loop_;
   BrowserThread ui_thread_;
   scoped_refptr<PreferenceDataTypeController> preference_dtc_;
@@ -167,4 +171,5 @@
   preference_dtc_->Start(NewCallback(&start_callback_, &StartCallback::Run));
   // This should cause preference_dtc_->Stop() to be called.
   preference_dtc_->OnUnrecoverableError(FROM_HERE, "Test");
+  PumpLoop();
 }