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

chrome/browser/history/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/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
-#include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/cancelable_request.h"
 #include "content/browser/download/download_persistent_store_info.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/registry_controlled_domain.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 152 matching lines @@
   bool track_unique_;
 
   // When track_unique_ is set, this is updated with every URL seen so far.
   std::set<GURL> unique_urls_;
 
   DISALLOW_COPY_AND_ASSIGN(URLQuerier);
 };
 
 // HistoryBackend --------------------------------------------------------------
 
-HistoryBackend::HistoryBackend(Profile* profile,
-                               const FilePath& history_dir,
+HistoryBackend::HistoryBackend(const FilePath& history_dir,
                                int id,
                                Delegate* delegate,
                                BookmarkService* bookmark_service)
     : delegate_(delegate),
       id_(id),
       history_dir_(history_dir),
       ALLOW_THIS_IN_INITIALIZER_LIST(expirer_(this, bookmark_service)),
       recent_redirects_(kMaxRedirectCount),
       backend_destroy_message_loop_(NULL),
       backend_destroy_task_(NULL),
       segment_queried_(false),
       bookmark_service_(bookmark_service) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableHistoryQuickProvider))
-    in_memory_url_index_.reset(new InMemoryURLIndex(profile, history_dir_));
 }
 
 HistoryBackend::~HistoryBackend() {
   DCHECK(!scheduled_commit_) << "Deleting without cleanup";
   ReleaseDBTasks();
 
   // First close the databases before optionally running the "destroy" task.
   if (db_.get()) {
     // Commit the long-running transaction.
     db_->CommitTransaction();
@@ skipping 398 matching lines @@
     // to delete the archived database and need to do so before we try to
     // open the file. We can ignore any error (maybe the file doesn't exist).
     file_util::Delete(archived_name, false);
   }
   archived_db_.reset(new ArchivedDatabase());
   if (!archived_db_->Init(archived_name)) {
     LOG(WARNING) << "Could not initialize the archived database.";
     archived_db_.reset();
   }
 
-  if (in_memory_url_index_.get())
-    in_memory_url_index_->Init(db_.get(), languages);
-
   // Tell the expiration module about all the nice databases we made. This must
   // happen before db_->Init() is called since the callback ForceArchiveHistory
   // may need to expire stuff.
   //
   // *sigh*, this can all be cleaned up when that migration code is removed.
   // The main DB initialization should intuitively be first (not that it
   // actually matters) and the expirer should be set last.
   expirer_.SetDatabases(db_.get(), archived_db_.get(),
                         thumbnail_db_.get(), text_database_.get());
 
@@ skipping 127 matching lines @@
 
     URLRow existing_url;
     URLID url_id = url_database->GetRowForURL(i->url(), &existing_url);
     if (!url_id) {
       // Add the page if it doesn't exist.
       url_id = url_database->AddURL(*i);
       if (!url_id) {
         NOTREACHED() << "Could not add row to DB";
         return;
       }
+
       if (i->typed_count() > 0)
         modified->changed_urls.push_back(*i);
     }
 
     // Add the page to the full text index. This function is also used for
     // importing. Even though we don't have page contents, we can at least
     // add the title and URL to the index so they can be searched. We don't
     // bother to delete any already-existing FTS entries for the URL, since
     // this is normally called on import.
     //
@@ skipping 66 matching lines @@
   }
 
   bool typed_url_changed = false;
   std::vector<URLRow> changed_urls;
   for (size_t i = 0; i < redirects->size(); i++) {
     URLRow row;
     URLID row_id = db_->GetRowForURL(redirects->at(i), &row);
     if (row_id && row.title() != title) {
       row.set_title(title);
       db_->UpdateURLRow(row_id, row);
-      row.id_ = row_id;
       changed_urls.push_back(row);
       if (row.typed_count() > 0)
         typed_url_changed = true;
     }
   }
 
   // Broadcast notifications for typed URLs that have changed. This will
   // update the in-memory database.
   //
   // TODO(brettw) bug 1140020: Broadcast for all changes (not just typed),
@@ skipping 1394 matching lines @@
         break;
       }
     }
   }
   UMA_HISTOGRAM_TIMES("History.GetFavIconFromDB",  // historical name
                       TimeTicks::Now() - beginning_time);
   return success;
 }
 
 }  // namespace history