summaryrefslogtreecommitdiffstats
path: root/chrome/browser/webdata
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 20:31:07 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 20:31:07 +0000
commitafbd35400d2a2ab034acb20584092aa71a808e72 (patch)
treeb29b3ce55a082b0789ec5fb689acda724a83e424 /chrome/browser/webdata
parente6cbd163a5ca21026de45af8b708710a054f5b43 (diff)
downloadchromium_src-afbd35400d2a2ab034acb20584092aa71a808e72.zip
chromium_src-afbd35400d2a2ab034acb20584092aa71a808e72.tar.gz
chromium_src-afbd35400d2a2ab034acb20584092aa71a808e72.tar.bz2
AutoFill: Implement set_whole_number and use it to load whole phone numbers from the WebDB.
BUG=38218 TEST=WebDatabaseTest.AutoFillProfile Review URL: http://codereview.chromium.org/1043003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata')
-rw-r--r--chrome/browser/webdata/web_database.cc4
-rw-r--r--chrome/browser/webdata/web_database_unittest.cc7
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index d87ef0b..5e29246 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -1443,9 +1443,9 @@ static AutoFillProfile* AutoFillProfileFromStatement(const sql::Statement& s) {
ASCIIToUTF16(s.ColumnString(11)));
profile->SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY),
ASCIIToUTF16(s.ColumnString(12)));
- profile->SetInfo(AutoFillType(PHONE_HOME_NUMBER),
+ profile->SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER),
ASCIIToUTF16(s.ColumnString(13)));
- profile->SetInfo(AutoFillType(PHONE_FAX_NUMBER),
+ profile->SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER),
ASCIIToUTF16(s.ColumnString(14)));
return profile;
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index 9a84816..1482f84 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -3,7 +3,10 @@
// found in the LICENSE file.
#include <list>
+#include <map>
+#include <set>
#include <string>
+#include <utility>
#include <vector>
#include "base/file_util.h"
@@ -1116,9 +1119,9 @@ TEST_F(WebDatabaseTest, AutoFillProfile) {
home_profile.SetInfo(AutoFillType(ADDRESS_HOME_STATE), ASCIIToUTF16("CA"));
home_profile.SetInfo(AutoFillType(ADDRESS_HOME_ZIP), ASCIIToUTF16("90025"));
home_profile.SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), ASCIIToUTF16("US"));
- home_profile.SetInfo(AutoFillType(PHONE_HOME_NUMBER),
+ home_profile.SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER),
ASCIIToUTF16("18181234567"));
- home_profile.SetInfo(AutoFillType(PHONE_FAX_NUMBER),
+ home_profile.SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER),
ASCIIToUTF16("1915243678"));
EXPECT_TRUE(db.AddAutoFillProfile(home_profile));