Store the language code for the address in autofill profile.

components/test/data/web_database/version_54.sql

 PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
 CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY, value LONGVARCHAR);
 INSERT INTO "meta" VALUES('version','54');
 INSERT INTO "meta" VALUES('last_compatible_version','54');
 INSERT INTO "meta" VALUES('Builtin Keyword Version','69');
 INSERT INTO "meta" VALUES('Default Search Provider ID','7');
 CREATE TABLE keywords (id INTEGER PRIMARY KEY,short_name VARCHAR NOT NULL,keyword VARCHAR NOT NULL,favicon_url VARCHAR NOT NULL,url VARCHAR NOT NULL,safe_for_autoreplace INTEGER,originating_url VARCHAR,date_created INTEGER DEFAULT 0,usage_count INTEGER DEFAULT 0,input_encodings VARCHAR,show_in_default_list INTEGER,suggest_url VARCHAR,prepopulate_id INTEGER DEFAULT 0,created_by_policy INTEGER DEFAULT 0,instant_url VARCHAR,last_modified INTEGER DEFAULT 0,sync_guid VARCHAR,alternate_urls VARCHAR,search_terms_replacement_key VARCHAR,image_url VARCHAR,search_url_post_params VARCHAR,suggest_url_post_params VARCHAR,instant_url_post_params VARCHAR,image_url_post_params VARCHAR,new_tab_url VARCHAR);
 CREATE TABLE token_service (service VARCHAR PRIMARY KEY NOT NULL,encrypted_token BLOB);
 CREATE TABLE web_app_icons (url LONGVARCHAR,width int,height int,image BLOB, UNIQUE (url, width, height));
 CREATE TABLE web_apps (url LONGVARCHAR UNIQUE,has_all_images INTEGER NOT NULL);
 CREATE TABLE web_intents ( service_url LONGVARCHAR, action VARCHAR, type VARCHAR, title LONGVARCHAR, disposition VARCHAR, scheme VARCHAR, UNIQUE (service_url, action, scheme, type));
 CREATE TABLE web_intents_defaults ( action VARCHAR, type VARCHAR, url_pattern LONGVARCHAR, user_date INTEGER, suppression INTEGER, service_url LONGVARCHAR, scheme VARCHAR, UNIQUE (action, scheme, type, url_pattern));
 CREATE TABLE autofill (name VARCHAR, value VARCHAR, value_lower VARCHAR, pair_id INTEGER PRIMARY KEY, count INTEGER DEFAULT 1);
 INSERT INTO "autofill" VALUES('Name','John Doe','john doe',10,1);
 INSERT INTO "autofill" VALUES('Name','john doe','john doe',11,1);
 INSERT INTO "autofill" VALUES('Email','jane@example.com','jane@example.com',20,3);
 INSERT INTO "autofill" VALUES('Email','jane.doe@example.org','jane.doe@example.org',21,4);
 CREATE TABLE credit_cards ( guid VARCHAR PRIMARY KEY, name_on_card VARCHAR, expiration_month INTEGER, expiration_year INTEGER, card_number_encrypted BLOB, date_modified INTEGER NOT NULL DEFAULT 0, origin VARCHAR DEFAULT '');
 CREATE TABLE autofill_dates ( pair_id INTEGER DEFAULT 0, date_created INTEGER DEFAULT 0);
 INSERT INTO "autofill_dates" VALUES(10,1384299100);
 INSERT INTO "autofill_dates" VALUES(11,1384299200);
 INSERT INTO "autofill_dates" VALUES(20,1384299300);
 INSERT INTO "autofill_dates" VALUES(20,1384299301);
 INSERT INTO "autofill_dates" VALUES(21,1384299401);
 INSERT INTO "autofill_dates" VALUES(21,1384299400);
 INSERT INTO "autofill_dates" VALUES(21,1384299403);
 INSERT INTO "autofill_dates" VALUES(21,1384299402);
-CREATE TABLE autofill_profiles ( guid VARCHAR PRIMARY KEY, company_name VARCHAR, address_line_1 VARCHAR, address_line_2 VARCHAR, city VARCHAR, state VARCHAR, zipcode VARCHAR, country VARCHAR, country_code VARCHAR, date_modified INTEGER NOT NULL DEFAULT 0, origin VARCHAR DEFAULT '');
+CREATE TABLE autofill_profiles ( guid VARCHAR PRIMARY KEY, company_name VARCHAR, street_address VARCHAR, dependent_locality VARCHAR, city VARCHAR, state VARCHAR, zipcode VARCHAR, sorting_code VARCHAR, country_code VARCHAR, date_modified INTEGER NOT NULL DEFAULT 0, origin VARCHAR DEFAULT '');

[Scott Hess - ex-Googler, 2014/03/28 19:53:57]

Golden files should never be modified, the v54->v55 update code should handle
the case.

[please use gerrit instead, 2014/03/28 22:00:38]

This change was originally necessary because version_54.sql had v53
autofill_profiles schema. The change is no longer necessary after I switched to
the "ALTER TABLE ADD COLUMN" statement as you advised. However, I think that
WebDatabaseMigrationTest.MigrateVersion54ToCurrent unit test might fail the next
time someone alters autofill_profiles schema again.

TL;DR: I removed this change.

[Scott Hess - ex-Googler, 2014/03/31 17:46:38]

Hmm, if I'm reading this right, you're saying that the v54 golden file actually
doesn't match the schema generated by creating the database with v54 code?  In
that case it needs to be fixed.  The golden files should match what was in
production as of that version, which is why they should never be modified :-).

Maybe there should be a generic test to verify that the current golden schema
actually matches the current code output.

 CREATE TABLE autofill_profile_names ( guid VARCHAR, first_name VARCHAR, middle_name VARCHAR, last_name VARCHAR);
 CREATE TABLE autofill_profile_emails ( guid VARCHAR, email VARCHAR);
 CREATE TABLE autofill_profile_phones ( guid VARCHAR, type INTEGER DEFAULT 0, number VARCHAR);
 CREATE TABLE autofill_profiles_trash ( guid VARCHAR);
 CREATE INDEX web_apps_url_index ON web_apps (url);
 CREATE INDEX web_intents_index ON web_intents (action);
 CREATE INDEX web_intents_default_index ON web_intents_defaults (action);
 CREATE INDEX autofill_name ON autofill (name);
 CREATE INDEX autofill_name_value_lower ON autofill (name, value_lower);
 CREATE INDEX autofill_dates_pair_id ON autofill_dates (pair_id);
 COMMIT;