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

chrome/browser/history/history_backend.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_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 #pragma once
 
 #include <string>
 #include <utility>
@@ skipping 265 matching lines @@
   void DeleteAllSearchTermsForKeyword(TemplateURLID keyword_id);
 
   void GetMostRecentKeywordSearchTerms(
       scoped_refptr<GetMostRecentKeywordSearchTermsRequest> request,
       TemplateURLID keyword_id,
       const string16& prefix,
       int max_count);
 
   // Generic operations --------------------------------------------------------
 
-  // Returns our database if it has been set, otherwise NULL.
-  URLDatabase* database() { return db_.get(); }
-
   void ProcessDBTask(scoped_refptr<HistoryDBTaskRequest> request);
 
   virtual bool GetAllTypedURLs(std::vector<history::URLRow>* urls);
 
   virtual bool GetVisitsForURL(URLID id, VisitVector* visits);
 
   // Fetches up to |max_visits| most recent visits for the passed URL.
   virtual bool GetMostRecentVisitsForURL(URLID id,
                                          int max_visits,
                                          VisitVector* visits);
@@ skipping 344 matching lines @@
   // Publishes the history to all indexers which are registered to receive
   // history data from us. Can be NULL if there are no listeners.
   scoped_ptr<HistoryPublisher> history_publisher_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_