Revert 111378 - HQP Refactoring (in Preparation for SQLite Cache)

chrome/browser/history/history.h

 // Copyright (c) 2011 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_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 125 matching lines @@
   void NotifyRenderProcessHostDestruction(const void* host);
 
   // Triggers the backend to load if it hasn't already, and then returns the
   // in-memory URL database. The returned pointer MAY BE NULL if the in-memory
   // database has not been loaded yet. This pointer is owned by the history
   // system. Callers should not store or cache this value.
   //
   // TODO(brettw) this should return the InMemoryHistoryBackend.
   history::URLDatabase* InMemoryDatabase();
 
-  // Returns the history database if it has been set, otherwise NULL.
-  history::URLDatabase* HistoryDatabase();
+  // Return the quick history index.
+  history::InMemoryURLIndex* InMemoryIndex();
 
   // Navigation ----------------------------------------------------------------
 
   // Adds the given canonical URL to history with the current time as the visit
   // time. Referrer may be the empty string.
   //
   // The supplied render process host is used to scope the given page ID. Page
   // IDs are only unique inside a given render process, so we need that to
   // differentiate them. This pointer should not be dereferenced by the history
   // system. Since render view host pointers may be reused (if one gets deleted
@@ skipping 337 matching lines @@
   // specified text. The matching is case insensitive. The results are ordered
   // in descending order up to |max_count| with the most recent search term
   // first.
   Handle GetMostRecentKeywordSearchTerms(
       TemplateURLID keyword_id,
       const string16& prefix,
       int max_count,
       CancelableRequestConsumerBase* consumer,
       const GetMostRecentKeywordSearchTermsCallback& callback);
 
-  // InMemoryURLIndex ----------------------------------------------------------
-
-  // Returns the quick history index.
-  history::InMemoryURLIndex* InMemoryIndex();
-
   // Bookmarks -----------------------------------------------------------------
 
   // Notification that a URL is no longer bookmarked.
   void URLsNoLongerBookmarked(const std::set<GURL>& urls);
 
   // Generic Stuff -------------------------------------------------------------
 
   // Schedules a HistoryDBTask for running on the history backend thread. See
   // HistoryDBTask for details on what this does.
   virtual void ScheduleDBTask(HistoryDBTask* task,
@@ skipping 323 matching lines @@
   //
   // This pointer will be NULL once Cleanup() has been called, meaning no
   // more calls should be made to the history thread.
   scoped_refptr<history::HistoryBackend> history_backend_;
 
   // A cache of the user-typed URLs kept in memory that is used by the
   // autocomplete system. This will be NULL until the database has been created
   // on the background thread.
   scoped_ptr<history::InMemoryHistoryBackend> in_memory_backend_;
 
-  // The index used for quick history lookups.
-  scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
-
   // The profile, may be null when testing.
   Profile* profile_;
 
   // Has the backend finished loading? The backend is loaded once Init has
   // completed.
   bool backend_loaded_;
 
   // The id of the current backend. This is only valid when history_backend_
   // is not NULL.
   int current_backend_id_;
 
   // Cached values from Init(), used whenever we need to reload the backend.
   FilePath history_dir_;
   BookmarkService* bookmark_service_;
   bool no_db_;
 
   // True if needs top site migration.
   bool needs_top_sites_migration_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_H_