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

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

Issue 469073002: Revert 289113 "Revert 288557 "[Sync] Use OnSingleDataTypeUnrecov..." (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/frontend_data_type_controller_unittest.cc
===================================================================
--- trunk/src/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc (revision 289354)
+++ trunk/src/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc (working copy)
@@ -255,21 +255,3 @@
frontend_dtc_->Stop();
EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());
}
-
-TEST_F(SyncFrontendDataTypeControllerTest, OnSingleDatatypeUnrecoverableError) {
- SetStartExpectations();
- SetAssociateExpectations();
- SetActivateExpectations(DataTypeController::OK);
- EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, "Test"));
- EXPECT_CALL(service_, DisableDatatype(_))
- .WillOnce(InvokeWithoutArgs(frontend_dtc_.get(),
- &FrontendDataTypeController::Stop));
- SetStopExpectations();
- EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());
- Start();
- EXPECT_EQ(DataTypeController::RUNNING, frontend_dtc_->state());
- // This should cause frontend_dtc_->Stop() to be called.
- frontend_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
- PumpLoop();
- EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());
-}

Powered by Google App Engine
This is Rietveld 408576698