sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler

chrome/browser/sync/glue/ui_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc b/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
index 97fad7af661b0eabc02e0d95ae08acfc68ffe8bb..5c2dbacef9f817f4fad77dc1db0aa919eca75ef7 100644
--- a/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
@@ -195,9 +195,9 @@ TEST_F(SyncUIDataTypeControllerTest,
 
 // Start the DTC, but then trigger an unrecoverable error. Verify the syncer
 // gets stopped and the DTC is in NOT_RUNNING state.
-TEST_F(SyncUIDataTypeControllerTest, OnUnrecoverableError) {
+TEST_F(SyncUIDataTypeControllerTest, OnSingleDatatypeUnrecoverableError) {
   SetActivateExpectations();
-  EXPECT_CALL(profile_sync_service_, OnUnrecoverableError(_,_)).
+  EXPECT_CALL(profile_sync_service_, OnDisableDatatype(_,_,_)).
       WillOnce(InvokeWithoutArgs(preference_dtc_.get(),
                                  &UIDataTypeController::Stop));
   SetStopExpectations();
@@ -207,7 +207,7 @@ TEST_F(SyncUIDataTypeControllerTest, OnUnrecoverableError) {
   EXPECT_FALSE(syncable_service_.syncing());
   Start();
   EXPECT_TRUE(syncable_service_.syncing());
-  preference_dtc_->OnUnrecoverableError(FROM_HERE, "Test");
+  preference_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
   PumpLoop();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, preference_dtc_->state());
   EXPECT_FALSE(syncable_service_.syncing());