Autofill rename GetFieldText to GetInfo

Renames AutofillProfile::GetFieldText to AutofillProfile::GetInfo.  To match SetInfo.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78622 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 48 insertions, 51 deletions

diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 7e6c922..a69ce86 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -293,19 +293,19 @@ void BindAutofillProfileToStatement(const AutofillProfile& profile,
   DCHECK(guid::IsValidGUID(profile.guid()));
   s->BindString(0, profile.guid());
 
-  string16 text = profile.GetFieldText(COMPANY_NAME);
+  string16 text = profile.GetInfo(COMPANY_NAME);
   s->BindString16(1, LimitDataSize(text));
-  text = profile.GetFieldText(ADDRESS_HOME_LINE1);
+  text = profile.GetInfo(ADDRESS_HOME_LINE1);
   s->BindString16(2, LimitDataSize(text));
-  text = profile.GetFieldText(ADDRESS_HOME_LINE2);
+  text = profile.GetInfo(ADDRESS_HOME_LINE2);
   s->BindString16(3, LimitDataSize(text));
-  text = profile.GetFieldText(ADDRESS_HOME_CITY);
+  text = profile.GetInfo(ADDRESS_HOME_CITY);
   s->BindString16(4, LimitDataSize(text));
-  text = profile.GetFieldText(ADDRESS_HOME_STATE);
+  text = profile.GetInfo(ADDRESS_HOME_STATE);
   s->BindString16(5, LimitDataSize(text));
-  text = profile.GetFieldText(ADDRESS_HOME_ZIP);
+  text = profile.GetInfo(ADDRESS_HOME_ZIP);
   s->BindString16(6, LimitDataSize(text));
-  text = profile.GetFieldText(ADDRESS_HOME_COUNTRY);
+  text = profile.GetInfo(ADDRESS_HOME_COUNTRY);
   s->BindString16(7, LimitDataSize(text));
   std::string country_code = profile.CountryCode();
   s->BindString(8, country_code);
@@ -369,13 +369,13 @@ void BindCreditCardToStatement(const CreditCard& credit_card,
   DCHECK(guid::IsValidGUID(credit_card.guid()));
   s->BindString(0, credit_card.guid());
 
-  string16 text = credit_card.GetFieldText(CREDIT_CARD_NAME);
+  string16 text = credit_card.GetInfo(CREDIT_CARD_NAME);
   s->BindString16(1, LimitDataSize(text));
-  text = credit_card.GetFieldText(CREDIT_CARD_EXP_MONTH);
+  text = credit_card.GetInfo(CREDIT_CARD_EXP_MONTH);
   s->BindString16(2, LimitDataSize(text));
-  text = credit_card.GetFieldText(CREDIT_CARD_EXP_4_DIGIT_YEAR);
+  text = credit_card.GetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR);
   s->BindString16(3, LimitDataSize(text));
-  text = credit_card.GetFieldText(CREDIT_CARD_NUMBER);
+  text = credit_card.GetInfo(CREDIT_CARD_NUMBER);
   std::string encrypted_data;
   Encryptor::EncryptString16(text, &encrypted_data);
   s->BindBlob(4, encrypted_data.data(),
@@ -409,9 +409,9 @@ CreditCard* CreditCardFromStatement(const sql::Statement& s) {
 }
 
 bool AutofillProfileHasName(const AutofillProfile& profile) {
-  return !profile.GetFieldText(NAME_FIRST).empty() ||
-         !profile.GetFieldText(NAME_MIDDLE).empty() ||
-         !profile.GetFieldText(NAME_MIDDLE).empty();
+  return !profile.GetInfo(NAME_FIRST).empty() ||
+         !profile.GetInfo(NAME_MIDDLE).empty() ||
+         !profile.GetInfo(NAME_MIDDLE).empty();
 }
 
 bool AddAutofillProfileName(const std::string& guid,
@@ -430,9 +430,9 @@ bool AddAutofillProfileName(const std::string& guid,
     return false;
   }
   s_find.BindString(0, guid);
-  s_find.BindString16(1, profile.GetFieldText(NAME_FIRST));
-  s_find.BindString16(2, profile.GetFieldText(NAME_MIDDLE));
-  s_find.BindString16(3, profile.GetFieldText(NAME_LAST));
+  s_find.BindString16(1, profile.GetInfo(NAME_FIRST));
+  s_find.BindString16(2, profile.GetInfo(NAME_MIDDLE));
+  s_find.BindString16(3, profile.GetInfo(NAME_LAST));
 
   if (!s_find.Step()) {
     // Add the new name.
@@ -445,9 +445,9 @@ bool AddAutofillProfileName(const std::string& guid,
       return false;
     }
     s.BindString(0, guid);
-    s.BindString16(1, profile.GetFieldText(NAME_FIRST));
-    s.BindString16(2, profile.GetFieldText(NAME_MIDDLE));
-    s.BindString16(3, profile.GetFieldText(NAME_LAST));
+    s.BindString16(1, profile.GetInfo(NAME_FIRST));
+    s.BindString16(2, profile.GetInfo(NAME_MIDDLE));
+    s.BindString16(3, profile.GetInfo(NAME_LAST));
 
     if (!s.Run()) {
       NOTREACHED();
@@ -460,7 +460,7 @@ bool AddAutofillProfileName(const std::string& guid,
 bool AddAutofillProfileEmail(const std::string& guid,
                              const AutofillProfile& profile,
                              sql::Connection* db) {
-  if (profile.GetFieldText(EMAIL_ADDRESS).empty())
+  if (profile.GetInfo(EMAIL_ADDRESS).empty())
     return true;
 
   // Check for duplicate.
@@ -473,7 +473,7 @@ bool AddAutofillProfileEmail(const std::string& guid,
     return false;
   }
   s_find.BindString(0, guid);
-  s_find.BindString16(1, profile.GetFieldText(EMAIL_ADDRESS));
+  s_find.BindString16(1, profile.GetInfo(EMAIL_ADDRESS));
 
   if (!s_find.Step()) {
     sql::Statement s(db->GetUniqueStatement(
@@ -485,7 +485,7 @@ bool AddAutofillProfileEmail(const std::string& guid,
       return false;
     }
     s.BindString(0, guid);
-    s.BindString16(1, profile.GetFieldText(EMAIL_ADDRESS));
+    s.BindString16(1, profile.GetInfo(EMAIL_ADDRESS));
 
     if (!s.Run()) {
       NOTREACHED();
@@ -509,7 +509,7 @@ bool AddAutofillProfilePhone(const std::string& guid,
     return false;
   }
 
-  if (profile.GetFieldText(field_type).empty())
+  if (profile.GetInfo(field_type).empty())
     return true;
 
   // Check for duplicate.
@@ -523,8 +523,7 @@ bool AddAutofillProfilePhone(const std::string& guid,
   }
   s_find.BindString(0, guid);
   s_find.BindInt(1, phone_type);
-  s_find.BindString16(
-      2, profile.GetFieldText(field_type));
+  s_find.BindString16(2, profile.GetInfo(field_type));
 
   if (!s_find.Step()) {
     sql::Statement s(db->GetUniqueStatement(
@@ -537,8 +536,7 @@ bool AddAutofillProfilePhone(const std::string& guid,
     }
     s.BindString(0, guid);
     s.BindInt(1, phone_type);
-    s.BindString16(
-        2, profile.GetFieldText(field_type));
+    s.BindString16(2, profile.GetInfo(field_type));
 
     if (!s.Run()) {
       NOTREACHED();
@@ -3090,14 +3088,13 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded(){
               return sql::INIT_FAILURE;
             }
             s_insert.BindString(0, profile.guid());
-            s_insert.BindString16(1, profile.GetFieldText(COMPANY_NAME));
-            s_insert.BindString16(2, profile.GetFieldText(ADDRESS_HOME_LINE1));
-            s_insert.BindString16(3, profile.GetFieldText(ADDRESS_HOME_LINE2));
-            s_insert.BindString16(4, profile.GetFieldText(ADDRESS_HOME_CITY));
-            s_insert.BindString16(5, profile.GetFieldText(ADDRESS_HOME_STATE));
-            s_insert.BindString16(6, profile.GetFieldText(ADDRESS_HOME_ZIP));
-            s_insert.BindString16(7,
-                                  profile.GetFieldText(ADDRESS_HOME_COUNTRY));
+            s_insert.BindString16(1, profile.GetInfo(COMPANY_NAME));
+            s_insert.BindString16(2, profile.GetInfo(ADDRESS_HOME_LINE1));
+            s_insert.BindString16(3, profile.GetInfo(ADDRESS_HOME_LINE2));
+            s_insert.BindString16(4, profile.GetInfo(ADDRESS_HOME_CITY));
+            s_insert.BindString16(5, profile.GetInfo(ADDRESS_HOME_STATE));
+            s_insert.BindString16(6, profile.GetInfo(ADDRESS_HOME_ZIP));
+            s_insert.BindString16(7, profile.GetInfo(ADDRESS_HOME_COUNTRY));
             s_insert.BindInt64(8, date_modified);
 
             if (!s_insert.Run()) {
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index f528e90..ac0ac1f 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -1585,7 +1585,7 @@ TEST_F(WebDatabaseTest, AutofillProfileTrashInteraction) {
   AutofillProfile* updated_profile = NULL;
   EXPECT_TRUE(db.GetAutofillProfile(profile.guid(), &updated_profile));
   ASSERT_NE(static_cast<AutofillProfile*>(NULL), added_profile);
-  EXPECT_EQ(ASCIIToUTF16("John"), updated_profile->GetFieldText(NAME_FIRST));
+  EXPECT_EQ(ASCIIToUTF16("John"), updated_profile->GetInfo(NAME_FIRST));
   delete updated_profile;
 
   // Try to delete the trashed profile.  This stops |RemoveAutofillProfile| from
@@ -2847,20 +2847,20 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion31ToCurrent) {
     EXPECT_NO_FATAL_FAILURE(AutofillProfile33FromStatement(
         s1, &profile_a, &profile_date_modified_a));
     EXPECT_EQ(profile.guid(), profile_a.guid());
-    EXPECT_EQ(profile.GetFieldText(COMPANY_NAME),
-              profile_a.GetFieldText(COMPANY_NAME));
-    EXPECT_EQ(profile.GetFieldText(ADDRESS_HOME_LINE1),
-              profile_a.GetFieldText(ADDRESS_HOME_LINE1));
-    EXPECT_EQ(profile.GetFieldText(ADDRESS_HOME_LINE2),
-              profile_a.GetFieldText(ADDRESS_HOME_LINE2));
-    EXPECT_EQ(profile.GetFieldText(ADDRESS_HOME_CITY),
-              profile_a.GetFieldText(ADDRESS_HOME_CITY));
-    EXPECT_EQ(profile.GetFieldText(ADDRESS_HOME_STATE),
-              profile_a.GetFieldText(ADDRESS_HOME_STATE));
-    EXPECT_EQ(profile.GetFieldText(ADDRESS_HOME_ZIP),
-              profile_a.GetFieldText(ADDRESS_HOME_ZIP));
-    EXPECT_EQ(profile.GetFieldText(ADDRESS_HOME_COUNTRY),
-              profile_a.GetFieldText(ADDRESS_HOME_COUNTRY));
+    EXPECT_EQ(profile.GetInfo(COMPANY_NAME),
+              profile_a.GetInfo(COMPANY_NAME));
+    EXPECT_EQ(profile.GetInfo(ADDRESS_HOME_LINE1),
+              profile_a.GetInfo(ADDRESS_HOME_LINE1));
+    EXPECT_EQ(profile.GetInfo(ADDRESS_HOME_LINE2),
+              profile_a.GetInfo(ADDRESS_HOME_LINE2));
+    EXPECT_EQ(profile.GetInfo(ADDRESS_HOME_CITY),
+              profile_a.GetInfo(ADDRESS_HOME_CITY));
+    EXPECT_EQ(profile.GetInfo(ADDRESS_HOME_STATE),
+              profile_a.GetInfo(ADDRESS_HOME_STATE));
+    EXPECT_EQ(profile.GetInfo(ADDRESS_HOME_ZIP),
+              profile_a.GetInfo(ADDRESS_HOME_ZIP));
+    EXPECT_EQ(profile.GetInfo(ADDRESS_HOME_COUNTRY),
+              profile_a.GetInfo(ADDRESS_HOME_COUNTRY));
     EXPECT_EQ(profile_date_modified, profile_date_modified_a);
 
     sql::Statement s2(