diff options
Diffstat (limited to 'chrome/browser/autofill/personal_data_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/autofill/personal_data_manager_unittest.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc index 630b1eb..90f8d81 100644 --- a/chrome/browser/autofill/personal_data_manager_unittest.cc +++ b/chrome/browser/autofill/personal_data_manager_unittest.cc @@ -25,10 +25,10 @@ #include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/form_data.h" +#include "webkit/forms/form_data.h" using content::BrowserThread; -using webkit_glue::FormData; +using webkit::forms::FormData; ACTION(QuitUIMessageLoop) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -480,7 +480,7 @@ TEST_F(PersonalDataManagerTest, Refresh) { TEST_F(PersonalDataManagerTest, ImportFormData) { FormData form; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form.fields.push_back(field); @@ -525,7 +525,7 @@ TEST_F(PersonalDataManagerTest, ImportFormData) { TEST_F(PersonalDataManagerTest, ImportFormDataBadEmail) { FormData form; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form.fields.push_back(field); @@ -560,7 +560,7 @@ TEST_F(PersonalDataManagerTest, ImportFormDataBadEmail) { TEST_F(PersonalDataManagerTest, ImportFormDataNotEnoughFilledFields) { FormData form; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form.fields.push_back(field); @@ -585,7 +585,7 @@ TEST_F(PersonalDataManagerTest, ImportFormDataNotEnoughFilledFields) { TEST_F(PersonalDataManagerTest, ImportPhoneNumberSplitAcrossMultipleFields) { FormData form; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form.fields.push_back(field); @@ -676,7 +676,7 @@ TEST_F(PersonalDataManagerTest, SetUniqueCreditCardLabels) { TEST_F(PersonalDataManagerTest, AggregateTwoDifferentProfiles) { FormData form1; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form1.fields.push_back(field); @@ -767,7 +767,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoDifferentProfiles) { TEST_F(PersonalDataManagerTest, AggregateTwoProfilesWithMultiValue) { FormData form1; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form1.fields.push_back(field); @@ -862,7 +862,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoProfilesWithMultiValue) { TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) { FormData form1; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form1.fields.push_back(field); @@ -972,7 +972,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) { TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInOld) { FormData form1; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form1.fields.push_back(field); @@ -1059,7 +1059,7 @@ TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInOld) { TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInNew) { FormData form1; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form1.fields.push_back(field); @@ -1150,7 +1150,7 @@ TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInNew) { TEST_F(PersonalDataManagerTest, AggregateProfileWithInsufficientAddress) { FormData form1; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form1.fields.push_back(field); @@ -1200,7 +1200,7 @@ TEST_F(PersonalDataManagerTest, AggregateExistingAuxiliaryProfile) { // Simulate a form submission with a subset of the info. // Note that the phone number format is different from the saved format. FormData form; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "Tester", "text", &field); form.fields.push_back(field); @@ -1247,7 +1247,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoDifferentCreditCards) { FormData form1; // Start with a single valid credit card form. - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "Name on card:", "name_on_card", "Biggie Smalls", "text", &field); form1.fields.push_back(field); @@ -1323,7 +1323,7 @@ TEST_F(PersonalDataManagerTest, AggregateInvalidCreditCard) { FormData form1; // Start with a single valid credit card form. - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "Name on card:", "name_on_card", "Biggie Smalls", "text", &field); form1.fields.push_back(field); @@ -1390,7 +1390,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithConflict) { FormData form1; // Start with a single valid credit card form. - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "Name on card:", "name_on_card", "Biggie Smalls", "text", &field); form1.fields.push_back(field); @@ -1466,7 +1466,7 @@ TEST_F(PersonalDataManagerTest, AggregateEmptyCreditCardWithConflict) { FormData form1; // Start with a single valid credit card form. - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "Name on card:", "name_on_card", "Biggie Smalls", "text", &field); form1.fields.push_back(field); @@ -1534,7 +1534,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInNew) { FormData form1; // Start with a single valid credit card form. - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "Name on card:", "name_on_card", "Biggie Smalls", "text", &field); form1.fields.push_back(field); @@ -1650,7 +1650,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInOld) { // Add a second different valid credit card where the year is different but // the credit card number matches. FormData form; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "Name on card:", "name_on_card", "Biggie Smalls", "text", &field); form.fields.push_back(field); @@ -1707,7 +1707,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithSeparators) { // Import the same card info, but with different separators in the number. FormData form; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "Name on card:", "name_on_card", "Biggie Smalls", "text", &field); form.fields.push_back(field); @@ -1861,7 +1861,7 @@ TEST_F(PersonalDataManagerTest, GetNonEmptyTypes) { TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) { FormData form1; - webkit_glue::FormField field; + webkit::forms::FormField field; autofill_test::CreateTestFormField( "First name:", "first_name", "George", "text", &field); form1.fields.push_back(field); |