sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler

chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc
index 0042cf7b5fb0b19409861ce571d1701ba2993c46..123c5c6e5f612acb33571762339693d4d293da41 100644
--- a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc
@@ -256,11 +256,12 @@ TEST_F(SyncAppNotificationDataTypeControllerTest, Stop) {
   EXPECT_FALSE(syncable_service_.syncing());
 }
 
-TEST_F(SyncAppNotificationDataTypeControllerTest, OnUnrecoverableError) {
+TEST_F(SyncAppNotificationDataTypeControllerTest,
+       OnSingleDatatypeUnrecoverableError) {
   SetStartExpectations();
   InitAndLoadManager();
   SetActivateExpectations();
-  EXPECT_CALL(service_, OnUnrecoverableError(_, _)).
+  EXPECT_CALL(service_, OnDisableDatatype(_, _, _)).
       WillOnce(InvokeWithoutArgs(app_notif_dtc_.get(),
                                  &AppNotificationDataTypeController::Stop));
   SetStopExpectations();
@@ -270,7 +271,7 @@ TEST_F(SyncAppNotificationDataTypeControllerTest, OnUnrecoverableError) {
   EXPECT_EQ(DataTypeController::RUNNING, app_notif_dtc_->state());
   EXPECT_TRUE(syncable_service_.syncing());
   // This should cause app_notif_dtc_->Stop() to be called.
-  app_notif_dtc_->OnUnrecoverableError(FROM_HERE, "Test");
+  app_notif_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
   PumpLoop();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, app_notif_dtc_->state());
   EXPECT_FALSE(syncable_service_.syncing());