[Sync] Cleanup datatype configuration error handling.

components/sync_driver/ui_data_type_controller_unittest.cc

Index: components/sync_driver/ui_data_type_controller_unittest.cc
diff --git a/components/sync_driver/ui_data_type_controller_unittest.cc b/components/sync_driver/ui_data_type_controller_unittest.cc
index 46d635baee29af003f57fe414b72a78c4a8eeecc..ad3cc5337ee9d1847be04752bbf2082a67dacca0 100644
--- a/components/sync_driver/ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/ui_data_type_controller_unittest.cc
@@ -15,6 +15,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
+using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 
@@ -196,11 +197,10 @@ TEST_F(SyncUIDataTypeControllerTest, OnSingleDatatypeUnrecoverableError) {
   EXPECT_FALSE(syncable_service_.syncing());
   Start();
   EXPECT_TRUE(syncable_service_.syncing());
+
+  testing::Mock::VerifyAndClearExpectations(&start_callback_);
+  EXPECT_CALL(start_callback_, Run(DataTypeController::RUNTIME_ERROR, _, _));
   preference_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
-  PumpLoop();
-  EXPECT_EQ(DataTypeController::NOT_RUNNING, preference_dtc_->state());
-  EXPECT_TRUE(disable_callback_invoked_);
-  EXPECT_FALSE(syncable_service_.syncing());
 }
 
 }  // namespace