Index: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc |
=================================================================== |
--- trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc (revision 289111) |
+++ trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc (working copy) |
@@ -373,7 +373,7 @@ |
// Disabled due to http://crbug.com/388367 |
TEST_F(SyncNonFrontendDataTypeControllerTest, |
- DISABLED_OnSingleDataTypeUnrecoverableError) { |
+ DISABLED_OnSingleDatatypeUnrecoverableError) { |
SetStartExpectations(); |
SetAssociateExpectations(); |
SetActivateExpectations(DataTypeController::OK); |
@@ -387,14 +387,11 @@ |
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(), |
- error)); |
+ FROM_HERE, |
+ std::string("Test"))); |
WaitForDTC(); |
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_frontend_dtc_->state()); |
} |