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

chrome/browser/webdata/keyword_table.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_
 #define CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 33 matching lines @@
 //   suggest_url
 //   prepopulate_id         See TemplateURLData::prepopulate_id.
 //   created_by_policy      See TemplateURLData::created_by_policy.  This was
 //                          added in version 26.
 //   instant_url            See TemplateURLData::instant_url.  This was added in
 //                          version 29.
 //   last_modified          See TemplateURLData::last_modified.  This was added
 //                          in version 38.
 //   sync_guid              See TemplateURLData::sync_guid. This was added in
 //                          version 39.
+//   alternate_urls         See TemplateURLData::alternate_urls. This was added
+//                          in version 47.
 //
 // keywords_backup          The full copy of the |keywords| table. Added in
 //                          version 43. Must be in sync with |keywords|
 //                          table otherwise verification of default search
 //                          provider settings will fail.
 //
 // This class also manages some fields in the |meta| table:
 //
 // Default Search Provider ID        The id of the default search provider.
 // Default Search Provider ID Backup
@@ skipping 18 matching lines @@
 
   // Constants exposed for the benefit of test code:
 
   static const char kDefaultSearchProviderKey[];
   // Meta table key to store backup value for the default search provider id.
   static const char kDefaultSearchIDBackupKey[];
   // Meta table key to store backup value signature for the default search
   // provider.  The default search provider ID and the |keywords_backup| table
   // are signed.
   static const char kBackupSignatureKey[];
-  // Comma-separated list of keyword table column names, in order.
-  static const char kKeywordColumns[];
 
   KeywordTable(sql::Connection* db, sql::MetaTable* meta_table);
   virtual ~KeywordTable();
   virtual bool Init() OVERRIDE;
   virtual bool IsSyncable() OVERRIDE;
 
   // Adds a new keyword, updating the id field on success.
   // Returns true if successful.
   bool AddKeyword(const TemplateURLData& data);
 
@@ skipping 25 matching lines @@
 
   // Version of the built-in keywords.
   bool SetBuiltinKeywordVersion(int version);
   int GetBuiltinKeywordVersion();
 
   // Table migration functions.
   bool MigrateToVersion21AutoGenerateKeywordColumn();
   bool MigrateToVersion25AddLogoIDColumn();
   bool MigrateToVersion26AddCreatedByPolicyColumn();
   bool MigrateToVersion28SupportsInstantColumn();
-  bool MigrateToVersion29InstantUrlToSupportsInstant();
+  bool MigrateToVersion29InstantURLToSupportsInstant();
   bool MigrateToVersion38AddLastModifiedColumn();
   bool MigrateToVersion39AddSyncGUIDColumn();
   bool MigrateToVersion44AddDefaultSearchProviderBackup();
   bool MigrateToVersion45RemoveLogoIDAndAutogenerateColumns();
+  bool MigrateToVersion47AddAlternateURLsColumn();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, DefaultSearchProviderBackup);
   FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, GetTableContents);
   FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, GetTableContentsOrdering);
   FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, SanitizeURLs);
+  FRIEND_TEST_ALL_PREFIXES(WebDatabaseMigrationTest, MigrateVersion27ToCurrent);
+  FRIEND_TEST_ALL_PREFIXES(WebDatabaseMigrationTest, MigrateVersion42ToCurrent);
   FRIEND_TEST_ALL_PREFIXES(WebDatabaseMigrationTest, MigrateVersion44ToCurrent);
 
+  // Returns a comma-separated list of the keyword columns for the current
+  // version of the table.

[Peter Kasting, 2012/10/04 19:32:43]

Nit: I'd be OK with making this public if it allows us to remove the FRIEND_TEST
declarations for all the migration tests above.

[beaudoin, 2012/10/04 23:10:45]

Done.

+  static std::string GetKeywordColumns();
+
   // NOTE: Since the table columns have changed in different versions, many
   // functions below take a |table_version| argument which dictates which
   // version number's column set to use.
 
   // Fills |data| with the data in |s|.  Returns false if we couldn't fill
   // |data| for some reason, e.g. |s| tried to set one of the fields to an
   // illegal value.
   static bool GetKeywordDataFromStatement(const sql::Statement& s,
                                           TemplateURLData* data);
 
@@ skipping 25 matching lines @@
   // keyword. Returns true on success, false otherwise.
   bool GetKeywordAsString(TemplateURLID id,
                           const std::string& table_name,
                           std::string* result);
 
   // Updates default search provider id backup in |meta| table. Returns
   // true on success. The id is returned back via |id| parameter.
   bool UpdateDefaultSearchProviderIDBackup(TemplateURLID* id);
 
   // Migrates table |name| (which should be either "keywords" or
-  // "keywords_backup" from version 44 to version 45.
+  // "keywords_backup") from version 44 to version 45.
   bool MigrateKeywordsTableForVersion45(const std::string& name);
 
   // Whether the backup was overwritten during migration.
   bool backup_overwritten_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordTable);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_