| Index: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
|
| index ddfd910ab3875ddd866ba6752d55b0525ec49d3c..ec186096d7ea2dd220ee1cb2f07a636e8c312fdb 100644
|
| --- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
|
| @@ -28,10 +28,6 @@ using testing::SetArgumentPointee;
|
| namespace browser_sync {
|
| namespace {
|
|
|
| -ACTION(MakeSharedChangeProcessor) {
|
| - return new SharedChangeProcessor();
|
| -}
|
| -
|
| ACTION_P(ReturnAndRelease, change_processor) {
|
| return change_processor->release();
|
| }
|
| @@ -74,8 +70,6 @@ class SyncSearchEngineDataTypeControllerTest : public testing::Test {
|
| EXPECT_CALL(*profile_sync_factory_,
|
| GetSyncableServiceForType(syncer::SEARCH_ENGINES)).
|
| WillOnce(Return(syncable_service_.AsWeakPtr()));
|
| - EXPECT_CALL(*profile_sync_factory_, CreateSharedChangeProcessor()).
|
| - WillOnce(MakeSharedChangeProcessor());
|
| EXPECT_CALL(*profile_sync_factory_,
|
| CreateGenericChangeProcessor(_, _, _, _)).
|
| WillOnce(ReturnAndRelease(&change_processor_));
|
| @@ -128,9 +122,6 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceReady) {
|
| }
|
|
|
| TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceNotReady) {
|
| - EXPECT_CALL(*profile_sync_factory_, CreateSharedChangeProcessor()).
|
| - WillOnce(MakeSharedChangeProcessor());
|
| -
|
| EXPECT_CALL(model_load_callback_, Run(_, _));
|
| EXPECT_FALSE(syncable_service_.syncing());
|
| search_engine_dtc_->LoadModels(
|
|
|