Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

Issue 465113002: Revert 288557 "[Sync] Use OnSingleDataTypeUnrecoverableError for..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
}

Powered by Google App Engine
This is Rietveld 408576698