| Index: chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
|
| index a383e14920a062c26bdcfb53de66038ce50718c5..605313b9944dad8345a2e8f2a6ebc1315731ace9 100644
|
| --- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
|
| @@ -373,7 +373,7 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, Stop) {
|
|
|
| // Disabled due to http://crbug.com/388367
|
| TEST_F(SyncNonFrontendDataTypeControllerTest,
|
| - DISABLED_OnSingleDatatypeUnrecoverableError) {
|
| + DISABLED_OnSingleDataTypeUnrecoverableError) {
|
| SetStartExpectations();
|
| SetAssociateExpectations();
|
| SetActivateExpectations(DataTypeController::OK);
|
| @@ -387,11 +387,14 @@ TEST_F(SyncNonFrontendDataTypeControllerTest,
|
| WaitForDTC();
|
| EXPECT_EQ(DataTypeController::RUNNING, non_frontend_dtc_->state());
|
| // This should cause non_frontend_dtc_->Stop() to be called.
|
| + syncer::SyncError error(FROM_HERE,
|
| + syncer::SyncError::DATATYPE_ERROR,
|
| + "error",
|
| + non_frontend_dtc_->type());
|
| BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, base::Bind(
|
| - &NonFrontendDataTypeControllerFake::OnSingleDatatypeUnrecoverableError,
|
| + &NonFrontendDataTypeControllerFake::OnSingleDataTypeUnrecoverableError,
|
| non_frontend_dtc_.get(),
|
| - FROM_HERE,
|
| - std::string("Test")));
|
| + error));
|
| WaitForDTC();
|
| EXPECT_EQ(DataTypeController::NOT_RUNNING, non_frontend_dtc_->state());
|
| }
|
|
|