Revert 212459 "Remove TextDatabase from the history service."

trunk/src/chrome/browser/history/history_backend.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_HISTORY_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/containers/mru_cache.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_marshaling.h"
 #include "chrome/browser/history/history_types.h"
+#include "chrome/browser/history/text_database_manager.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/browser/history/visit_tracker.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "sql/init_status.h"
 #include "ui/base/layout.h"
 
 class BookmarkService;
 class TestingProfile;
 class TypedUrlSyncableService;
 struct ThumbnailScore;
@@ skipping 121 matching lines @@
   // The page can be identified by the combination of the pointer to
   // a RenderProcessHost, the page id and the url.
   //
   // The given pointer will not be dereferenced, it is only used for
   // identification purposes, hence it is a void*.
   void UpdateWithPageEndTime(const void* host,
                              int32 page_id,
                              const GURL& url,
                              base::Time end_ts);
 
+
+  // Indexing ------------------------------------------------------------------
+
+  void SetPageContents(const GURL& url, const string16& contents);
+
   // Querying ------------------------------------------------------------------
 
   // ScheduleAutocomplete() never frees |provider| (which is globally live).
   // It passes |params| on to the autocomplete system which will eventually
   // free it.
   void ScheduleAutocomplete(HistoryURLProvider* provider,
                             HistoryURLProviderParams* params);
 
   void IterateURLs(
       const scoped_refptr<visitedlink::VisitedLinkDelegate::URLEnumerator>&
@@ skipping 377 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, GetFaviconsFromDBSingleIconURL);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, GetFaviconsFromDBIconType);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, GetFaviconsFromDBExpired);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest,
                            UpdateFaviconMappingsAndFetchNoDB);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest,
                            CloneFaviconIsRestrictedToSameDomain);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, QueryFilteredURLs);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, UpdateVisitDuration);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, ExpireHistoryForTimes);
-  FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, DeleteFTSIndexDatabases);
 
   friend class ::TestingProfile;
 
   // Computes the name of the specified database on disk.
   base::FilePath GetThumbnailFileName() const;
 
   // Returns the name of the Favicons database. This is the new name
   // of the Thumbnails database.
   // See ThumbnailDatabase::RenameAndDropThumbnails.
   base::FilePath GetFaviconsFileName() const;
@@ skipping 74 matching lines @@
   // The *Text() version performs a brute force query of the history DB to
   // search for results which match the given text query.
   // Both functions assume QueryHistory already checked the DB for validity.
   void QueryHistoryBasic(URLDatabase* url_db, VisitDatabase* visit_db,
                          const QueryOptions& options, QueryResults* result);
   void QueryHistoryText(URLDatabase* url_db,
                         VisitDatabase* visit_db,
                         const string16& text_query,
                         const QueryOptions& options,
                         QueryResults* result);
+  void QueryHistoryFTS(const string16& text_query,
+                       const QueryOptions& options,
+                       QueryResults* result);
 
   // Committing ----------------------------------------------------------------
 
   // We always keep a transaction open on the history database so that multiple
   // transactions can be batched. Periodically, these are flushed (use
   // ScheduleCommit). This function does the commit to write any new changes to
   // disk and opens a new transaction. This will be called automatically by
   // ScheduleCommit, or it can be called explicitly if a caller really wants
   // to write something to disk.
   void Commit();
@@ skipping 162 matching lines @@
   // vector to reference the new IDs.
   bool ClearAllThumbnailHistory(URLRows* kept_urls);
 
   // Deletes all information in the history database, except for the supplied
   // set of URLs in the URL table (these should correspond to the bookmarked
   // URLs).
   //
   // The IDs of the URLs may change.
   bool ClearAllMainHistory(const URLRows& kept_urls);
 
-  // Deletes the FTS index database files, which are no longer used.
-  void DeleteFTSIndexDatabases();
-
   // Returns the BookmarkService, blocking until it is loaded. This may return
   // NULL during testing.
   BookmarkService* GetBookmarkService();
 
   // Notify any observers of an addition to the visit database.
   void NotifyVisitObservers(const VisitRow& visit);
 
   // Data ----------------------------------------------------------------------
 
   // Delegate. See the class definition above for more information. This will
@@ skipping 12 matching lines @@
   // not be opened, all users must first check for NULL and return immediately
   // if it is. The thumbnail DB may be NULL when the history one isn't, but not
   // vice-versa.
   scoped_ptr<HistoryDatabase> db_;
   bool scheduled_kill_db_;  // Database is being killed due to error.
   scoped_ptr<ThumbnailDatabase> thumbnail_db_;
 
   // Stores old history in a larger, slower database.
   scoped_ptr<ArchivedDatabase> archived_db_;
 
+  // Full text database manager, possibly NULL if the database could not be
+  // created.
+  scoped_ptr<TextDatabaseManager> text_database_;
+
   // Manages expiration between the various databases.
   ExpireHistoryBackend expirer_;
 
   // A commit has been scheduled to occur sometime in the future. We can check
   // non-null-ness to see if there is a commit scheduled in the future, and we
   // can use the pointer to cancel the scheduled commit. There can be only one
   // scheduled commit at a time (see ScheduleCommit).
   scoped_refptr<CommitLaterTask> scheduled_commit_;
 
   // Maps recent redirect destination pages to the chain of redirects that
@@ skipping 54 matching lines @@
 
   // Listens for the system being under memory pressure.
   scoped_ptr<base::MemoryPressureListener> memory_pressure_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_