Autofill: Remove fax number completely.

chrome/browser/webdata/web_database_migration_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
@@ skipping 33 matching lines @@
   profile->SetInfo(NAME_LAST, s.ColumnString16(4));
   profile->SetInfo(EMAIL_ADDRESS, s.ColumnString16(5));
   profile->SetInfo(COMPANY_NAME, s.ColumnString16(6));
   profile->SetInfo(ADDRESS_HOME_LINE1, s.ColumnString16(7));
   profile->SetInfo(ADDRESS_HOME_LINE2, s.ColumnString16(8));
   profile->SetInfo(ADDRESS_HOME_CITY, s.ColumnString16(9));
   profile->SetInfo(ADDRESS_HOME_STATE, s.ColumnString16(10));
   profile->SetInfo(ADDRESS_HOME_ZIP, s.ColumnString16(11));
   profile->SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(12));
   profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(13));
-  profile->SetInfo(PHONE_FAX_WHOLE_NUMBER, s.ColumnString16(14));
   *date_modified = s.ColumnInt64(15);
   profile->set_guid(s.ColumnString(16));
   EXPECT_TRUE(guid::IsValidGUID(profile->guid()));
 }
 
 void AutofillProfile33FromStatement(const sql::Statement& s,
                                     AutofillProfile* profile,
                                     int64* date_modified) {
   DCHECK(profile);
   DCHECK(date_modified);
@@ skipping 1095 matching lines @@
             "SELECT guid, type, number "
             "FROM autofill_profile_phones"));
 
     // John Doe phone.
     ASSERT_TRUE(s4.Step());
     EXPECT_EQ("00580526-FF81-EE2A-0546-1AC593A32E2F", s4.ColumnString(0));
     EXPECT_EQ(0, s4.ColumnInt(1));  // 0 means phone.
     EXPECT_EQ(ASCIIToUTF16("4151112222"), s4.ColumnString16(2));
 
     // John Doe fax.
-    ASSERT_TRUE(s4.Step());
-    EXPECT_EQ("00580526-FF81-EE2A-0546-1AC593A32E2F", s4.ColumnString(0));
-    EXPECT_EQ(1, s4.ColumnInt(1));  // 1 means phone.
-    EXPECT_EQ(ASCIIToUTF16("4153334444"), s4.ColumnString16(2));
+    // Gets culled after fax type removed.
 
     // John P. Doe phone.
     // Gets culled during migration from 35 to 37 due to merging of John Doe and
     // John P. Doe addresses.
 
     // John P. Doe fax.
     // Gets culled during migration from 35 to 37 due to merging of John Doe and
     // John P. Doe addresses.
 
     // 2 Main Street phone.
     ASSERT_TRUE(s4.Step());
     EXPECT_EQ("4C74A9D8-7EEE-423E-F9C2-E7FA70ED1396", s4.ColumnString(0));
     EXPECT_EQ(0, s4.ColumnInt(1));  // 0 means phone.
     EXPECT_EQ(ASCIIToUTF16(""), s4.ColumnString16(2));
 
     // 2 Main Street fax.
-    ASSERT_TRUE(s4.Step());
-    EXPECT_EQ("4C74A9D8-7EEE-423E-F9C2-E7FA70ED1396", s4.ColumnString(0));
-    EXPECT_EQ(1, s4.ColumnInt(1));  // 1 means fax.
-    EXPECT_EQ(ASCIIToUTF16(""), s4.ColumnString16(2));
+    // Gets culled after fax type removed.
 
     // 2 Main St phone.
     ASSERT_TRUE(s4.Step());
     EXPECT_EQ("722DF5C4-F74A-294A-46F0-31FFDED0D635", s4.ColumnString(0));
     EXPECT_EQ(0, s4.ColumnInt(1));  // 0 means phone.
     EXPECT_EQ(ASCIIToUTF16(""), s4.ColumnString16(2));
 
     // 2 Main St fax.
-    ASSERT_TRUE(s4.Step());
-    EXPECT_EQ("722DF5C4-F74A-294A-46F0-31FFDED0D635", s4.ColumnString(0));
-    EXPECT_EQ(1, s4.ColumnInt(1));  // 1 means fax.
-    EXPECT_EQ(ASCIIToUTF16(""), s4.ColumnString16(2));
+    // Gets culled after fax type removed.
 
     // Note no phone or fax for Alfred E Newman.
 
     // 3 Main St phone.
     ASSERT_TRUE(s4.Step());
     EXPECT_EQ("9E5FE298-62C7-83DF-6293-381BC589183F", s4.ColumnString(0));
     EXPECT_EQ(0, s4.ColumnInt(1));  // 0 means phone.
     EXPECT_EQ(ASCIIToUTF16(""), s4.ColumnString16(2));
 
     // 2 Main St fax.
-    ASSERT_TRUE(s4.Step());
-    EXPECT_EQ("9E5FE298-62C7-83DF-6293-381BC589183F", s4.ColumnString(0));
-    EXPECT_EQ(1, s4.ColumnInt(1));  // 1 means fax.
-    EXPECT_EQ(ASCIIToUTF16(""), s4.ColumnString16(2));
+    // Gets culled after fax type removed.
 
     // Should be all.
     EXPECT_FALSE(s4.Step());
   }
 }
 
 // Adds a column for the autofill profile's country code.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion33ToCurrent) {
   // Initialize the database.
   ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_33.sql")));
@@ skipping 267 matching lines @@
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     // |keywords| |sync_guid| column should have been added.
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "id"));
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "sync_guid"));
   }
 }