| Index: chrome/browser/sync/profile_sync_service_unittest.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
|
| index a33e603844889f7bc957fc5b3da53e72a9922d72..f0a042765fcdd20c1c9488f4f1837f4985c7f22b 100644
|
| --- a/chrome/browser/sync/profile_sync_service_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_unittest.cc
|
| @@ -22,6 +22,7 @@
|
| #include "chrome/browser/signin/signin_manager_factory.h"
|
| #include "chrome/browser/sync/glue/sync_backend_host_mock.h"
|
| #include "chrome/browser/sync/profile_sync_service.h"
|
| +#include "chrome/browser/sync/profile_sync_test_util.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/grit/generated_resources.h"
|
| @@ -131,7 +132,7 @@ class SyncBackendHostNoReturn : public SyncBackendHostMock {
|
| const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
|
| unrecoverable_error_handler,
|
| const base::Closure& report_unrecoverable_error_function,
|
| - syncer::NetworkResources* network_resources,
|
| + const HttpPostProviderFactoryGetter& http_post_provider_factory_getter,
|
| scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state)
|
| override {}
|
| };
|
| @@ -156,7 +157,7 @@ class SyncBackendHostMockCollectDeleteDirParam : public SyncBackendHostMock {
|
| const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
|
| unrecoverable_error_handler,
|
| const base::Closure& report_unrecoverable_error_function,
|
| - syncer::NetworkResources* network_resources,
|
| + const HttpPostProviderFactoryGetter& http_post_provider_factory_getter,
|
| scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state)
|
| override {
|
| delete_dir_param_->push_back(delete_sync_data_folder);
|
| @@ -164,7 +165,7 @@ class SyncBackendHostMockCollectDeleteDirParam : public SyncBackendHostMock {
|
| frontend, sync_thread.Pass(), db_thread, file_thread, event_handler,
|
| service_url, sync_user_agent, credentials, delete_sync_data_folder,
|
| sync_manager_factory.Pass(), unrecoverable_error_handler,
|
| - report_unrecoverable_error_function, network_resources,
|
| + report_unrecoverable_error_function, http_post_provider_factory_getter,
|
| saved_nigori_state.Pass());
|
| }
|
|
|
| @@ -283,7 +284,7 @@ class ProfileSyncServiceTest : public ::testing::Test {
|
| service_.reset(new ProfileSyncService(
|
| sync_client.Pass(), profile_,
|
| make_scoped_ptr(new SigninManagerWrapper(signin)), oauth2_token_service,
|
| - behavior));
|
| + behavior, base::Bind(&EmptyNetworkTimeUpdate)));
|
| service_->SetClearingBrowseringDataForTesting(
|
| base::Bind(&ProfileSyncServiceTest::ClearBrowsingDataCallback,
|
| base::Unretained(this)));
|
|
|