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

Unified Diff: trunk/src/components/sync_driver/ui_data_type_controller_unittest.cc

Issue 469803004: Revert 289115 "Revert 288464 "[Sync] Cleanup datatype configurat..." (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
« no previous file with comments | « trunk/src/components/sync_driver/ui_data_type_controller.cc ('k') | trunk/src/sync/api/sync_error.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/components/sync_driver/ui_data_type_controller_unittest.cc
===================================================================
--- trunk/src/components/sync_driver/ui_data_type_controller_unittest.cc (revision 289352)
+++ trunk/src/components/sync_driver/ui_data_type_controller_unittest.cc (working copy)
@@ -15,6 +15,7 @@
#include "testing/gtest/include/gtest/gtest.h"
using testing::_;
+using testing::Invoke;
using testing::InvokeWithoutArgs;
using testing::Return;
@@ -196,11 +197,10 @@
EXPECT_FALSE(syncable_service_.syncing());
Start();
EXPECT_TRUE(syncable_service_.syncing());
+
+ testing::Mock::VerifyAndClearExpectations(&start_callback_);
+ EXPECT_CALL(start_callback_, Run(DataTypeController::RUNTIME_ERROR, _, _));
preference_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
- PumpLoop();
- EXPECT_EQ(DataTypeController::NOT_RUNNING, preference_dtc_->state());
- EXPECT_TRUE(disable_callback_invoked_);
- EXPECT_FALSE(syncable_service_.syncing());
}
} // namespace
« no previous file with comments | « trunk/src/components/sync_driver/ui_data_type_controller.cc ('k') | trunk/src/sync/api/sync_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698