Revert 111378 - 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"
@@ skipping 188 matching lines @@
       backend_destroy_message_loop_(NULL),
       backend_destroy_task_(NULL),
       segment_queried_(false),
       bookmark_service_(bookmark_service) {
 }
 
 HistoryBackend::~HistoryBackend() {
   DCHECK(!scheduled_commit_) << "Deleting without cleanup";
   ReleaseDBTasks();
 
-  // Close the databases before optionally running the "destroy" task.
+  // First close the databases before optionally running the "destroy" task.
   if (db_.get()) {
     // Commit the long-running transaction.
     db_->CommitTransaction();
     db_.reset();
   }
   if (thumbnail_db_.get()) {
     thumbnail_db_->CommitTransaction();
     thumbnail_db_.reset();
   }
   if (archived_db_.get()) {
@@ skipping 646 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 1418 matching lines @@
         break;
       }
     }
   }
   UMA_HISTOGRAM_TIMES("History.GetFavIconFromDB",  // historical name
                       TimeTicks::Now() - beginning_time);
   return success;
 }
 
 }  // namespace history