Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(859)

Unified Diff: chrome/browser/autofill/personal_data_manager_unittest.cc

Issue 11000016: Move forms/ out of webkit/. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Mostly cosmetic fixup Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autofill/personal_data_manager_unittest.cc
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc
index 3b4b1c6c894d575b458465edf22bcbf097adea69..5c320108ea3cac81a1990e32fa43ddd4f7b5694e 100644
--- a/chrome/browser/autofill/personal_data_manager_unittest.cc
+++ b/chrome/browser/autofill/personal_data_manager_unittest.cc
@@ -23,14 +23,14 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
+#include "content/public/common/form_data.h"
#include "content/public/test/mock_notification_observer.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/forms/form_data.h"
using content::BrowserThread;
-using webkit::forms::FormData;
+using content::FormData;
ACTION(QuitUIMessageLoop) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -483,7 +483,7 @@ TEST_F(PersonalDataManagerTest, Refresh) {
TEST_F(PersonalDataManagerTest, ImportFormData) {
FormData form;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form.fields.push_back(field);
@@ -528,7 +528,7 @@ TEST_F(PersonalDataManagerTest, ImportFormData) {
TEST_F(PersonalDataManagerTest, ImportFormDataBadEmail) {
FormData form;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form.fields.push_back(field);
@@ -563,7 +563,7 @@ TEST_F(PersonalDataManagerTest, ImportFormDataBadEmail) {
TEST_F(PersonalDataManagerTest, ImportFormDataNotEnoughFilledFields) {
FormData form;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form.fields.push_back(field);
@@ -588,7 +588,7 @@ TEST_F(PersonalDataManagerTest, ImportFormDataNotEnoughFilledFields) {
TEST_F(PersonalDataManagerTest, ImportPhoneNumberSplitAcrossMultipleFields) {
FormData form;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form.fields.push_back(field);
@@ -679,7 +679,7 @@ TEST_F(PersonalDataManagerTest, SetUniqueCreditCardLabels) {
TEST_F(PersonalDataManagerTest, AggregateTwoDifferentProfiles) {
FormData form1;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form1.fields.push_back(field);
@@ -770,7 +770,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoDifferentProfiles) {
TEST_F(PersonalDataManagerTest, AggregateTwoProfilesWithMultiValue) {
FormData form1;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form1.fields.push_back(field);
@@ -865,7 +865,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoProfilesWithMultiValue) {
TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) {
FormData form1;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form1.fields.push_back(field);
@@ -975,7 +975,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) {
TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInOld) {
FormData form1;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form1.fields.push_back(field);
@@ -1062,7 +1062,7 @@ TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInOld) {
TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInNew) {
FormData form1;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form1.fields.push_back(field);
@@ -1153,7 +1153,7 @@ TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInNew) {
TEST_F(PersonalDataManagerTest, AggregateProfileWithInsufficientAddress) {
FormData form1;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form1.fields.push_back(field);
@@ -1203,7 +1203,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::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "Tester", "text", &field);
form.fields.push_back(field);
@@ -1250,7 +1250,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoDifferentCreditCards) {
FormData form1;
// Start with a single valid credit card form.
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
form1.fields.push_back(field);
@@ -1326,7 +1326,7 @@ TEST_F(PersonalDataManagerTest, AggregateInvalidCreditCard) {
FormData form1;
// Start with a single valid credit card form.
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
form1.fields.push_back(field);
@@ -1393,7 +1393,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithConflict) {
FormData form1;
// Start with a single valid credit card form.
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
form1.fields.push_back(field);
@@ -1469,7 +1469,7 @@ TEST_F(PersonalDataManagerTest, AggregateEmptyCreditCardWithConflict) {
FormData form1;
// Start with a single valid credit card form.
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
form1.fields.push_back(field);
@@ -1537,7 +1537,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInNew) {
FormData form1;
// Start with a single valid credit card form.
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
form1.fields.push_back(field);
@@ -1653,7 +1653,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::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
form.fields.push_back(field);
@@ -1710,7 +1710,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithSeparators) {
// Import the same card info, but with different separators in the number.
FormData form;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
form.fields.push_back(field);
@@ -1864,7 +1864,7 @@ TEST_F(PersonalDataManagerTest, GetNonEmptyTypes) {
TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) {
FormData form1;
- webkit::forms::FormField field;
+ content::FormField field;
autofill_test::CreateTestFormField(
"First name:", "first_name", "George", "text", &field);
form1.fields.push_back(field);

Powered by Google App Engine
This is Rietveld 408576698