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

chrome/browser/history/in_memory_history_backend.cc

 // 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.
 
 #include "chrome/browser/history/in_memory_history_backend.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_database.h"
+#include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 
 namespace history {
 
 InMemoryHistoryBackend::InMemoryHistoryBackend()
     : profile_(NULL) {
 }
 
-InMemoryHistoryBackend::~InMemoryHistoryBackend() {}
+InMemoryHistoryBackend::~InMemoryHistoryBackend() {
+  if (index_.get())
+    index_->ShutDown();
+}
 
 bool InMemoryHistoryBackend::Init(const FilePath& history_filename,
                                   const FilePath& history_dir,
                                   URLDatabase* db,
                                   const std::string& languages) {
   db_.reset(new InMemoryDatabase);
-  return db_->InitFromDisk(history_filename);
+  bool success = db_->InitFromDisk(history_filename);
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableHistoryQuickProvider)) {
+    index_.reset(new InMemoryURLIndex(history_dir));
+    index_->Init(db, languages);
+  }
+  return success;
 }
 
 void InMemoryHistoryBackend::AttachToHistoryService(Profile* profile) {
   if (!db_.get()) {
     NOTREACHED();
     return;
   }
 
   profile_ = profile;
 
@@ skipping 65 matching lines @@
   // IDs in the main database. This sucks. Instead of Add and Remove, we should
   // have Sync(), which would take the ID if it's given and add it.
   std::vector<history::URLRow>::const_iterator i;
   for (i = details.changed_urls.begin();
        i != details.changed_urls.end(); i++) {
     URLID id = db_->GetRowForURL(i->url(), NULL);
     if (id)
       db_->UpdateURLRow(id, *i);
     else
       id = db_->AddURL(*i);
+    if (index_.get())
+      index_->UpdateURL(id, *i);
   }
 }
 
 void InMemoryHistoryBackend::OnURLsDeleted(const URLsDeletedDetails& details) {
+  DCHECK(db_.get());
+
   if (details.all_history) {
     // When all history is deleted, the individual URLs won't be listed. Just
     // create a new database to quickly clear everything out.
     db_.reset(new InMemoryDatabase);
     if (!db_->InitFromScratch())
       db_.reset();
+    if (index_.get())
+      index_->ReloadFromHistory(db_.get(), true);
     return;
   }
 
   // Delete all matching URLs in our database.
-  for (std::vector<URLRow>::const_iterator row = details.rows.begin();
-       row != details.rows.end(); ++row) {
-    // We typically won't have most of them since we only have a subset of
-    // history, so ignore errors.
-    db_->DeleteURLRow(row->id());
+  for (std::set<GURL>::const_iterator i = details.urls.begin();
+       i != details.urls.end(); ++i) {
+    URLID id = db_->GetRowForURL(*i, NULL);
+    if (id) {
+      // We typically won't have most of them since we only have a subset of
+      // history, so ignore errors.
+      db_->DeleteURLRow(id);
+      if (index_.get())
+        index_->DeleteURL(id);
+    }
   }
 }
 
 void InMemoryHistoryBackend::OnKeywordSearchTermUpdated(
     const KeywordSearchTermDetails& details) {
   // The url won't exist for new search terms (as the user hasn't typed it), so
   // we force it to be added. If we end up adding a URL it won't be
   // autocompleted as the typed count is 0.
   URLRow url_row;
   URLID url_id;
@@ skipping 15 matching lines @@
 
 bool InMemoryHistoryBackend::HasKeyword(const GURL& url) {
   URLID id = db_->GetRowForURL(url, NULL);
   if (!id)
     return false;
 
   return db_->GetKeywordSearchTermRow(id, NULL);
 }
 
 }  // namespace history