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

chrome/browser/webdata/web_database.cc

Index: chrome/browser/webdata/web_database.cc
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 5e6601e2fab4eb5b9444ffa6c3f479d07c4853c5..cdf9d5828cb624ee7aa13d169169f546efaf6c5c 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -21,11 +21,11 @@
 // corresponding changes must happen in the unit tests, and new migration test
 // added.  See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|.
 // static
-const int WebDatabase::kCurrentVersionNumber = 46;
+const int WebDatabase::kCurrentVersionNumber = 47;
 
 namespace {
 
-const int kCompatibleVersionNumber = 46;
+const int kCompatibleVersionNumber = 47;
 
 // Change the version number and possibly the compatibility version of
 // |meta_table_|.
@@ -239,7 +239,7 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded() {
       // FALL THROUGH
 
     case 28:
-      if (!keyword_table_->MigrateToVersion29InstantUrlToSupportsInstant())
+      if (!keyword_table_->MigrateToVersion29InstantURLToSupportsInstant())
         return FailedMigrationTo(29);
 
       ChangeVersion(&meta_table_, 29, true);
@@ -343,6 +343,13 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded() {
       ChangeVersion(&meta_table_, 46, true);
       // FALL THROUGH
 
+    case 46:
+      if (!keyword_table_->MigrateToVersion47AddAlternateURLsColumn())
+        return FailedMigrationTo(47);
+
+      ChangeVersion(&meta_table_, 47, true);
+      // FALL THROUGH
+
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.