diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
| commit | f8ee788a64d60abd8f2d742a5fdedde054ecd910 (patch) | |
| tree | 7dc14380200b953c64e0ccd16435cdbd1dbf1205 /chrome/browser/sync/profile_sync_service_autofill_unittest.cc | |
| parent | fcbbbe23a38088a52492922075e71a419c4b01ec (diff) | |
| download | chromium_org-f8ee788a64d60abd8f2d742a5fdedde054ecd910.tar.gz | |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_autofill_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_autofill_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index adac26c68c..1c80eac20e 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -392,7 +392,8 @@ class AutofillEntryFactory : public AbstractAutofillFactory { ProfileSyncComponentsFactory* factory, TestingProfile* profile, ProfileSyncService* service) OVERRIDE { - return new AutofillDataTypeController(factory, profile, service); + return new AutofillDataTypeController( + factory, profile, DataTypeController::DisableTypeCallback()); } virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, @@ -410,7 +411,8 @@ class AutofillProfileFactory : public AbstractAutofillFactory { ProfileSyncComponentsFactory* factory, TestingProfile* profile, ProfileSyncService* service) OVERRIDE { - return new AutofillProfileDataTypeController(factory, profile, service); + return new AutofillProfileDataTypeController( + factory, profile, DataTypeController::DisableTypeCallback()); } virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, |