[Sync] Use OnSingleDataTypeUnrecoverableError for all errors

chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
index d8b7ead3c08d0d621d4f449aec835a0feb953dc1..3c00de5cf5e04a317d4fe715ec9bd2a8a4297b5f 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
@@ -335,21 +335,3 @@ TEST_F(SyncBookmarkDataTypeControllerTest, Stop) {
   bookmark_dtc_->Stop();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, bookmark_dtc_->state());
 }
-
-TEST_F(SyncBookmarkDataTypeControllerTest, OnSingleDatatypeUnrecoverableError) {
-  CreateBookmarkModel(LOAD_MODEL);
-  SetStartExpectations();
-  SetAssociateExpectations();
-  EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
-      WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
-  EXPECT_CALL(service_, DisableDatatype(_)).
-      WillOnce(InvokeWithoutArgs(bookmark_dtc_.get(),
-                                 &BookmarkDataTypeController::Stop));
-  SetStopExpectations();
-
-  EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _, _));
-  Start();
-  // This should cause bookmark_dtc_->Stop() to be called.
-  bookmark_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
-  base::RunLoop().RunUntilIdle();
-}