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

chrome/browser/webdata/web_database.cc

 // Copyright (c) 2012 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 "chrome/browser/webdata/web_database.h"
 
 #include <algorithm>
 
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "content/public/browser/notification_service.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 // Current version number.  Note: when changing the current version number,
 // 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_|.
 void ChangeVersion(sql::MetaTable* meta_table,
                    int version_num,
                    bool update_compatible_version_num) {
   meta_table->SetVersionNumber(version_num);
   if (update_compatible_version_num) {
     meta_table->SetCompatibleVersionNumber(
           std::min(version_num, kCompatibleVersionNumber));
@@ skipping 193 matching lines @@
       // FALL THROUGH
 
     case 27:
       if (!keyword_table_->MigrateToVersion28SupportsInstantColumn())
         return FailedMigrationTo(28);
 
       ChangeVersion(&meta_table_, 28, true);
       // FALL THROUGH
 
     case 28:
-      if (!keyword_table_->MigrateToVersion29InstantUrlToSupportsInstant())
+      if (!keyword_table_->MigrateToVersion29InstantURLToSupportsInstant())
         return FailedMigrationTo(29);
 
       ChangeVersion(&meta_table_, 29, true);
       // FALL THROUGH
 
     case 29:
       if (!autofill_table_->MigrateToVersion30AddDateModifed())
         return FailedMigrationTo(30);
 
       ChangeVersion(&meta_table_, 30, true);
@@ skipping 83 matching lines @@
       ChangeVersion(&meta_table_, 45, true);
       // FALL THROUGH
 
     case 45:
       if (!web_intents_table_->MigrateToVersion46AddSchemeColumn())
         return FailedMigrationTo(46);
 
       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.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return sql::INIT_OK;
   }
 }