HQP Refactoring (in Preparation for SQLite Cache)

chrome/browser/history/history_backend.cc

Index: chrome/browser/history/history_backend.cc
===================================================================
--- chrome/browser/history/history_backend.cc	(revision 108940)
+++ chrome/browser/history/history_backend.cc	(working copy)
@@ -9,7 +9,6 @@
 #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"
@@ -211,14 +210,13 @@
       backend_destroy_message_loop_(NULL),
       backend_destroy_task_(NULL),
       segment_queried_(false),
-      bookmark_service_(bookmark_service) {
-}
+      bookmark_service_(bookmark_service) {}

[Peter Kasting, 2011/11/21 19:07:50]

Nit: I normally prefer the braces on separate lines unless the entire
constructor definition exists on a single line.

[mrossetti, 2011/11/21 21:53:25]

Done.

 
 HistoryBackend::~HistoryBackend() {
   DCHECK(!scheduled_commit_) << "Deleting without cleanup";
   ReleaseDBTasks();
 
-  // First close the databases before optionally running the "destroy" task.
+  // Close the databases before optionally running the "destroy" task.
   if (db_.get()) {
     // Commit the long-running transaction.
     db_->CommitTransaction();
@@ -885,6 +883,7 @@
     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;