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

Unified Diff: chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc

Issue 317453002: sync: cut a few profile deps from DataTypeControllers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move OnUserShareReady Created 6 years, 6 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: chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
index e27684aab1ab7f1de764f804277d002e1eec6cdf..e819fb6f10914d1a76f57200df6034cc46fe990a 100644
--- a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
@@ -103,7 +103,6 @@ class NonUIDataTypeControllerFake
base::MessageLoopProxy::current(),
base::Closure(),
profile_sync_factory,
- profile,
sync_service),
blocked_(false),
mock_(mock),
@@ -255,7 +254,6 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
void SetStopExpectations() {
EXPECT_CALL(*dtc_mock_.get(), StopModels());
EXPECT_CALL(*change_processor_.get(), Disconnect()).WillOnce(Return(true));
- EXPECT_CALL(service_, DeactivateDataType(_));
}
void SetStartFailExpectations(DataTypeController::StartResult result) {
@@ -425,7 +423,6 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringAssociation) {
AUTOFILL_PROFILE)));
EXPECT_CALL(*change_processor_.get(), Disconnect())
.WillOnce(DoAll(SignalEvent(&pause_db_thread), Return(true)));
- EXPECT_CALL(service_, DeactivateDataType(_));
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
Start();
wait_for_db_thread_pause.Wait();
@@ -445,7 +442,6 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartAfterSyncShutdown) {
// have been set.
EXPECT_CALL(*change_processor_.get(), Disconnect()).WillOnce(Return(true));
EXPECT_CALL(*dtc_mock_.get(), StopModels());
- EXPECT_CALL(service_, DeactivateDataType(_));
EXPECT_CALL(*dtc_mock_.get(),
RecordStartFailure(DataTypeController::ABORTED));
EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED, _, _));
« no previous file with comments | « chrome/browser/sync/glue/non_ui_data_type_controller.cc ('k') | chrome/browser/sync/glue/password_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698