Index: chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc |
diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc |
index 674d14e4b2fb42855b4b3c6406c77cbafc0ab332..f69ca95565b6444938f7e4944106b86d1c3437bb 100644 |
--- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc |
+++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc |
@@ -399,8 +399,7 @@ TEST_F(SyncNewNonFrontendDataTypeControllerTest, AbortDuringAssociation) { |
// Start the DTC while the backend tasks are blocked. Then stop the DTC before |
// the backend tasks get a chance to run. The DTC should have no interaction |
// with the profile sync factory or profile sync service once stopped. |
-// This test is flaky under memory tools, see http://crbug.com/117796 |
-TEST_F(SyncNewNonFrontendDataTypeControllerTest, FLAKY_StartAfterSyncShutdown) { |
+TEST_F(SyncNewNonFrontendDataTypeControllerTest, StartAfterSyncShutdown) { |
new_non_frontend_dtc_->BlockBackendTasks(); |
SetStartExpectations(); |
@@ -423,7 +422,6 @@ TEST_F(SyncNewNonFrontendDataTypeControllerTest, FLAKY_StartAfterSyncShutdown) { |
EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)). |
WillOnce(Return(base::WeakPtr<syncer::SyncableService>())); |
new_non_frontend_dtc_->UnblockBackendTasks(); |
- EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, _)); |
WaitForDTC(); |
} |