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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 16290004: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « chrome/browser/sync/glue/non_ui_data_type_controller.cc ('k') | chrome/browser/sync/glue/password_model_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4be7a1be32ac9676eb9e14c303ad1fd11d8e23ac..43107dade515d279e5f0f269545ed5a5fa1a1723 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
@@ -189,7 +189,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
protected:
void SetStartExpectations() {
- EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(true));
+ EXPECT_CALL(*dtc_mock_.get(), StartModels()).WillOnce(Return(true));
EXPECT_CALL(model_load_callback_, Run(_, _));
EXPECT_CALL(*profile_sync_factory_,
CreateSharedChangeProcessor()).
@@ -197,17 +197,17 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
}
void SetAssociateExpectations() {
- EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
- WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
- EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
- WillOnce(Return(true));
- EXPECT_CALL(*change_processor_, ActivateDataType(_));
- EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
- WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
- EXPECT_CALL(*change_processor_, GetSyncData(_)).
- WillOnce(Return(syncer::SyncError()));
- EXPECT_CALL(*change_processor_, GetSyncCount()).WillOnce(Return(0));
- EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+ EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+ .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+ EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+ .WillOnce(Return(true));
+ EXPECT_CALL(*change_processor_.get(), ActivateDataType(_));
+ EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+ .WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
+ EXPECT_CALL(*change_processor_.get(), GetSyncData(_))
+ .WillOnce(Return(syncer::SyncError()));
+ EXPECT_CALL(*change_processor_.get(), GetSyncCount()).WillOnce(Return(0));
+ EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
}
void SetActivateExpectations(DataTypeController::StartResult result) {
@@ -215,17 +215,17 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
}
void SetStopExpectations() {
- EXPECT_CALL(*dtc_mock_, StopModels());
- EXPECT_CALL(*change_processor_, Disconnect()).WillOnce(Return(true));
+ EXPECT_CALL(*dtc_mock_.get(), StopModels());
+ EXPECT_CALL(*change_processor_.get(), Disconnect()).WillOnce(Return(true));
EXPECT_CALL(service_, DeactivateDataType(_));
}
void SetStartFailExpectations(DataTypeController::StartResult result) {
- EXPECT_CALL(*dtc_mock_, StopModels()).Times(AtLeast(1));
+ EXPECT_CALL(*dtc_mock_.get(), StopModels()).Times(AtLeast(1));
if (DataTypeController::IsUnrecoverableResult(result))
- EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, _));
- EXPECT_CALL(*dtc_mock_, RecordStartFailure(result));
- EXPECT_CALL(start_callback_, Run(result,_,_));
+ EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, _));
+ EXPECT_CALL(*dtc_mock_.get(), RecordStartFailure(result));
+ EXPECT_CALL(start_callback_, Run(result, _, _));
}
void Start() {
@@ -269,15 +269,15 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartOk) {
TEST_F(SyncNonUIDataTypeControllerTest, StartFirstRun) {
SetStartExpectations();
- EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
- WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
- EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
- WillOnce(Return(true));
- EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
- WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));
- EXPECT_CALL(*change_processor_, GetSyncData(_)).
- WillOnce(Return(syncer::SyncError()));
- EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+ EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+ .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+ EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+ .WillOnce(Return(true));
+ EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+ .WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));
+ EXPECT_CALL(*change_processor_.get(), GetSyncData(_))
+ .WillOnce(Return(syncer::SyncError()));
+ EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
SetActivateExpectations(DataTypeController::OK_FIRST_RUN);
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
Start();
@@ -291,8 +291,8 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringStartModels) {
EXPECT_CALL(*profile_sync_factory_,
CreateSharedChangeProcessor()).
WillOnce(Return(change_processor_.get()));
- EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(false));
- EXPECT_CALL(*dtc_mock_, StopModels());
+ EXPECT_CALL(*dtc_mock_.get(), StartModels()).WillOnce(Return(false));
+ EXPECT_CALL(*dtc_mock_.get(), StopModels());
EXPECT_CALL(model_load_callback_, Run(_, _));
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
non_ui_dtc_->LoadModels(
@@ -309,15 +309,15 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringStartModels) {
// cleanly.
TEST_F(SyncNonUIDataTypeControllerTest, StartAssociationFailed) {
SetStartExpectations();
- EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
- WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
- EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
- WillOnce(Return(true));
- EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
- WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
- EXPECT_CALL(*change_processor_, GetSyncData(_)).
- WillOnce(Return(syncer::SyncError()));
- EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+ EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+ .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+ EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+ .WillOnce(Return(true));
+ EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+ .WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
+ EXPECT_CALL(*change_processor_.get(), GetSyncData(_))
+ .WillOnce(Return(syncer::SyncError()));
+ EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED);
// Set up association to fail with an association failed error.
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
@@ -336,12 +336,12 @@ TEST_F(SyncNonUIDataTypeControllerTest,
SetStartExpectations();
SetStartFailExpectations(DataTypeController::UNRECOVERABLE_ERROR);
// Set up association to fail with an unrecoverable error.
- EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
- WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
- EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
- WillRepeatedly(Return(true));
- EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
- WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(false)));
+ EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+ .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+ EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+ .WillRepeatedly(Return(true));
+ EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+ .WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(false)));
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
Start();
WaitForDTC();
@@ -353,10 +353,10 @@ TEST_F(SyncNonUIDataTypeControllerTest,
SetStartExpectations();
SetStartFailExpectations(DataTypeController::NEEDS_CRYPTO);
// Set up association to fail with a NEEDS_CRYPTO error.
- EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
- WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
- EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
- WillRepeatedly(Return(false));
+ EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+ .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+ EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+ .WillRepeatedly(Return(false));
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
Start();
WaitForDTC();
@@ -371,22 +371,19 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringAssociation) {
SetStartExpectations();
SetStartFailExpectations(DataTypeController::ABORTED);
- EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
- WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
- EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
- WillOnce(Return(true));
- EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
- WillOnce(DoAll(
- SignalEvent(&wait_for_db_thread_pause),
- WaitOnEvent(&pause_db_thread),
- SetArgumentPointee<0>(true),
- Return(true)));
- EXPECT_CALL(*change_processor_, GetSyncData(_)).
- WillOnce(
- Return(
- syncer::SyncError(FROM_HERE, "Disconnected.", AUTOFILL_PROFILE)));
- EXPECT_CALL(*change_processor_, Disconnect()).
- WillOnce(DoAll(SignalEvent(&pause_db_thread), Return(true)));
+ EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+ .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+ EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+ .WillOnce(Return(true));
+ EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+ .WillOnce(DoAll(SignalEvent(&wait_for_db_thread_pause),
+ WaitOnEvent(&pause_db_thread),
+ SetArgumentPointee<0>(true),
+ Return(true)));
+ EXPECT_CALL(*change_processor_.get(), GetSyncData(_)).WillOnce(
+ Return(syncer::SyncError(FROM_HERE, "Disconnected.", 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();
@@ -405,10 +402,11 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartAfterSyncShutdown) {
SetStartExpectations();
// We don't expect StopSyncing to be called because local_service_ will never
// have been set.
- EXPECT_CALL(*change_processor_, Disconnect()).WillOnce(Return(true));
- EXPECT_CALL(*dtc_mock_, StopModels());
+ EXPECT_CALL(*change_processor_.get(), Disconnect()).WillOnce(Return(true));
+ EXPECT_CALL(*dtc_mock_.get(), StopModels());
EXPECT_CALL(service_, DeactivateDataType(_));
- EXPECT_CALL(*dtc_mock_, RecordStartFailure(DataTypeController::ABORTED));
+ EXPECT_CALL(*dtc_mock_.get(),
+ RecordStartFailure(DataTypeController::ABORTED));
EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED, _, _));
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
Start();
@@ -416,11 +414,11 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartAfterSyncShutdown) {
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
Mock::VerifyAndClearExpectations(&profile_sync_factory_);
Mock::VerifyAndClearExpectations(&service_);
- Mock::VerifyAndClearExpectations(change_processor_);
- Mock::VerifyAndClearExpectations(dtc_mock_);
+ Mock::VerifyAndClearExpectations(change_processor_.get());
+ Mock::VerifyAndClearExpectations(dtc_mock_.get());
- EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
- WillOnce(Return(base::WeakPtr<syncer::SyncableService>()));
+ EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+ .WillOnce(Return(base::WeakPtr<syncer::SyncableService>()));
non_ui_dtc_->UnblockBackendTasks();
WaitForDTC();
}
@@ -471,10 +469,9 @@ TEST_F(SyncNonUIDataTypeControllerTest,
SetStartExpectations();
SetAssociateExpectations();
SetActivateExpectations(DataTypeController::OK);
- EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, "Test"));
- EXPECT_CALL(service_, DisableBrokenDatatype(_,_,_)).WillOnce(
- InvokeWithoutArgs(non_ui_dtc_.get(),
- &NonUIDataTypeController::Stop));
+ EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, "Test"));
+ EXPECT_CALL(service_, DisableBrokenDatatype(_, _, _)).WillOnce(
+ InvokeWithoutArgs(non_ui_dtc_.get(), &NonUIDataTypeController::Stop));
SetStopExpectations();
EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
Start();
« no previous file with comments | « chrome/browser/sync/glue/non_ui_data_type_controller.cc ('k') | chrome/browser/sync/glue/password_model_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698