sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler

chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc

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 cae10c107618c0a09e763110f31d851c5a7f4987..7ad09640cc2aa927883bff009f202a3a570486ef 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
@@ -465,12 +465,13 @@ TEST_F(SyncNewNonFrontendDataTypeControllerTest, StopStart) {
   EXPECT_EQ(DataTypeController::RUNNING, new_non_frontend_dtc_->state());
 }
 
-TEST_F(SyncNewNonFrontendDataTypeControllerTest, OnUnrecoverableError) {
+TEST_F(SyncNewNonFrontendDataTypeControllerTest,
+       OnSingleDatatypeUnrecoverableError) {
   SetStartExpectations();
   SetAssociateExpectations();
   SetActivateExpectations(DataTypeController::OK);
   EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, "Test"));
-  EXPECT_CALL(service_, OnUnrecoverableError(_,_)).WillOnce(
+  EXPECT_CALL(service_, OnDisableDatatype(_,_,_)).WillOnce(
       InvokeWithoutArgs(new_non_frontend_dtc_.get(),
                         &NewNonFrontendDataTypeController::Stop));
   SetStopExpectations();
@@ -479,12 +480,12 @@ TEST_F(SyncNewNonFrontendDataTypeControllerTest, OnUnrecoverableError) {
   WaitForDTC();
   EXPECT_EQ(DataTypeController::RUNNING, new_non_frontend_dtc_->state());
   // This should cause new_non_frontend_dtc_->Stop() to be called.
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::Bind(
-          &NewNonFrontendDataTypeControllerFake::OnUnrecoverableError,
-          new_non_frontend_dtc_.get(),
-          FROM_HERE,
-          std::string("Test")));
+  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, base::Bind(
+      &NewNonFrontendDataTypeControllerFake::
+          OnSingleDatatypeUnrecoverableError,
+      new_non_frontend_dtc_.get(),
+      FROM_HERE,
+      std::string("Test")));
   WaitForDTC();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, new_non_frontend_dtc_->state());
 }
@@ -492,4 +493,3 @@ TEST_F(SyncNewNonFrontendDataTypeControllerTest, OnUnrecoverableError) {
 }  // namespace
 
 }  // namespace browser_sync
-