| Index: chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| index 0b489d262012664f7254ea0b95e69e63d646fcd3..8c27a788614e88f2f9585cd57d8e65194333782d 100644
|
| --- a/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| +++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| @@ -168,8 +168,10 @@ class TestingSettingsStorageFactory : public SettingsStorageFactory {
|
| std::map<std::string, TestingSettingsStorage*> created_;
|
| };
|
|
|
| -void AssignSettingsService(SyncableService** dst, SyncableService* src) {
|
| - *dst = src;
|
| +void AssignSettingsService(SyncableService** dst,
|
| + const SettingsFrontend* frontend,
|
| + syncable::ModelType type) {
|
| + *dst = frontend->GetBackendForSync(type);
|
| }
|
|
|
| } // namespace
|
| @@ -205,11 +207,8 @@ class ExtensionSettingsSyncTest : public testing::Test {
|
|
|
| // Gets the SyncableService for the given sync type.
|
| SyncableService* GetSyncableService(syncable::ModelType model_type) {
|
| - SyncableService* settings_service = NULL;
|
| - frontend_->RunWithSyncableService(
|
| - model_type, base::Bind(&AssignSettingsService, &settings_service));
|
| MessageLoop::current()->RunAllPending();
|
| - return settings_service;
|
| + return frontend_->GetBackendForSync(model_type);
|
| }
|
|
|
| // Gets all the sync data from the SyncableService for a sync type as a map
|
|
|