Introduces a search term extraction mechanism working for arbitrary search providers.

chrome/test/data/web_database/version_46.sql

Index: chrome/test/data/web_database/version_46.sql
diff --git a/chrome/test/data/web_database/version_45_compatible.sql b/chrome/test/data/web_database/version_46.sql
similarity index 66%
copy from chrome/test/data/web_database/version_45_compatible.sql
copy to chrome/test/data/web_database/version_46.sql
index 158c40dfdda0e19fef4bbfd491f8a2066a3cecbf..7fae50c86b510edddb3cd5c9f8201479ff35e35a 100644
--- a/chrome/test/data/web_database/version_45_compatible.sql
+++ b/chrome/test/data/web_database/version_46.sql
@@ -2,8 +2,8 @@ PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
 CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY, value LONGVARCHAR);
 INSERT INTO "meta" VALUES('Default Search Provider ID','2');
-INSERT INTO "meta" VALUES('version','40');
-INSERT INTO "meta" VALUES('last_compatible_version','45');
+INSERT INTO "meta" VALUES('version','46');
+INSERT INTO "meta" VALUES('last_compatible_version','46');
 INSERT INTO "meta" VALUES('Default Search Provider ID Backup','2');
 INSERT INTO "meta" VALUES('Default Search Provider ID Backup Signature','');
 INSERT INTO "meta" VALUES('Builtin Keyword Version','39');
@@ -18,33 +18,14 @@ CREATE TABLE autofill_profiles_trash ( guid VARCHAR);
 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 token_service (service VARCHAR PRIMARY KEY NOT NULL,encrypted_token BLOB);
-CREATE TABLE web_intents (service_url LONGVARCHAR,action VARCHAR,type VARCHAR,title LONGVARCHAR,disposition VARCHAR,UNIQUE (service_url, action, type));
-CREATE TABLE web_intents_defaults (action VARCHAR,type VARCHAR,url_pattern LONGVARCHAR,user_date INTEGER,suppression INTEGER,service_url LONGVARCHAR,UNIQUE (action, type, url_pattern));
-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);
-CREATE TABLE keywords_backup(
-  id INT,
-  short_name TEXT,
-  keyword TEXT,
-  favicon_url TEXT,
-  url TEXT,
-  safe_for_autoreplace INT,
-  originating_url TEXT,
-  date_created INT,
-  usage_count INT,
-  input_encodings TEXT,
-  show_in_default_list INT,
-  suggest_url TEXT,
-  prepopulate_id INT,
-  created_by_policy INT,
-  instant_url TEXT,
-  last_modified INT,
-  sync_guid TEXT
-);
+CREATE TABLE web_intents (service_url LONGVARCHAR,action VARCHAR,type VARCHAR,title LONGVARCHAR,disposition VARCHAR,scheme VARCHAR,UNIQUE (service_url, action, 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, type, url_pattern));
+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);
+CREATE TABLE keywords_backup(id INT,short_name TEXT,keyword TEXT,favicon_url TEXT,url TEXT,safe_for_autoreplace INT,originating_url TEXT,date_created INT,usage_count INT,input_encodings TEXT,show_in_default_list INT,suggest_url TEXT,prepopulate_id INT,created_by_policy INT,instant_url TEXT,last_modified INT,sync_guid TEXT);
 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);
 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);
-COMMIT;
-
+COMMIT;