| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/test/integration/autofill_helper.h" | 5 #include "chrome/browser/sync/test/integration/autofill_helper.h" |
| 6 | 6 |
| 7 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 7 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/sync/profile_sync_service.h" | 9 #include "chrome/browser/sync/profile_sync_service.h" |
| 10 #include "chrome/browser/sync/profile_sync_test_util.h" | 10 #include "chrome/browser/sync/profile_sync_test_util.h" |
| 11 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 11 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
| 12 #include "chrome/browser/sync/test/integration/sync_test.h" | 12 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 13 #include "chrome/browser/webdata/web_data_service_factory.h" |
| 13 #include "chrome/common/chrome_notification_types.h" | 14 #include "chrome/common/chrome_notification_types.h" |
| 14 #include "components/autofill/browser/autofill_common_test.h" | 15 #include "components/autofill/browser/autofill_common_test.h" |
| 15 #include "components/autofill/browser/autofill_profile.h" | 16 #include "components/autofill/browser/autofill_profile.h" |
| 16 #include "components/autofill/browser/autofill_type.h" | 17 #include "components/autofill/browser/autofill_type.h" |
| 17 #include "components/autofill/browser/personal_data_manager.h" | 18 #include "components/autofill/browser/personal_data_manager.h" |
| 18 #include "components/autofill/browser/personal_data_manager_observer.h" | 19 #include "components/autofill/browser/personal_data_manager_observer.h" |
| 19 #include "components/autofill/browser/webdata/autofill_entry.h" | 20 #include "components/autofill/browser/webdata/autofill_entry.h" |
| 20 #include "components/autofill/browser/webdata/autofill_table.h" | 21 #include "components/autofill/browser/webdata/autofill_table.h" |
| 21 #include "components/autofill/browser/webdata/autofill_webdata_service.h" | 22 #include "components/autofill/browser/webdata/autofill_webdata_service.h" |
| 22 #include "components/autofill/common/form_field_data.h" | 23 #include "components/autofill/common/form_field_data.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 case PROFILE_NULL: | 158 case PROFILE_NULL: |
| 158 autofill::test::SetProfileInfoWithGuid(&profile, | 159 autofill::test::SetProfileInfoWithGuid(&profile, |
| 159 "FE461507-7E13-4198-8E66-74C7DB6D8322", | 160 "FE461507-7E13-4198-8E66-74C7DB6D8322", |
| 160 "", "", "", "", "", "", "", "", "", "", "", ""); | 161 "", "", "", "", "", "", "", "", "", "", "", ""); |
| 161 break; | 162 break; |
| 162 } | 163 } |
| 163 return profile; | 164 return profile; |
| 164 } | 165 } |
| 165 | 166 |
| 166 scoped_refptr<AutofillWebDataService> GetWebDataService(int index) { | 167 scoped_refptr<AutofillWebDataService> GetWebDataService(int index) { |
| 167 return AutofillWebDataService::FromBrowserContext(test()->GetProfile(index)); | 168 return WebDataServiceFactory::GetAutofillWebDataServiceForProfile( |
| 169 test()->GetProfile(index)); |
| 168 } | 170 } |
| 169 | 171 |
| 170 PersonalDataManager* GetPersonalDataManager(int index) { | 172 PersonalDataManager* GetPersonalDataManager(int index) { |
| 171 return autofill::PersonalDataManagerFactory::GetForProfile( | 173 return autofill::PersonalDataManagerFactory::GetForProfile( |
| 172 test()->GetProfile(index)); | 174 test()->GetProfile(index)); |
| 173 } | 175 } |
| 174 | 176 |
| 175 void AddKeys(int profile, const std::set<AutofillKey>& keys) { | 177 void AddKeys(int profile, const std::set<AutofillKey>& keys) { |
| 176 std::vector<FormFieldData> form_fields; | 178 std::vector<FormFieldData> form_fields; |
| 177 for (std::set<AutofillKey>::const_iterator i = keys.begin(); | 179 for (std::set<AutofillKey>::const_iterator i = keys.begin(); |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 if (!ProfilesMatch(0, i)) { | 352 if (!ProfilesMatch(0, i)) { |
| 351 LOG(ERROR) << "Profile " << i << "does not contain the same autofill " | 353 LOG(ERROR) << "Profile " << i << "does not contain the same autofill " |
| 352 "profiles as profile 0."; | 354 "profiles as profile 0."; |
| 353 return false; | 355 return false; |
| 354 } | 356 } |
| 355 } | 357 } |
| 356 return true; | 358 return true; |
| 357 } | 359 } |
| 358 | 360 |
| 359 } // namespace autofill_helper | 361 } // namespace autofill_helper |
| OLD | NEW |