Make DownloadHistory observe manager, items

chrome/browser/history/history_backend.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/bind.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 "base/utf_string_conversions.h"
 #include "chrome/browser/api/bookmarks/bookmark_service.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/cancelable_request.h"
+#include "chrome/browser/history/download_persistent_store_info.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/page_usage_data.h"
 #include "chrome/browser/history/select_favicon_frames.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/visit_filter.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/browser/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_domains/registry_controlled_domain.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/history/android/android_provider_backend.h"
 #endif
 
 using base::Time;
@@ skipping 1150 matching lines @@
   if (db_.get()) {
     request->value = db_->next_download_id();
   } else {
     request->value = 0;
   }
   request->ForwardResult(request->value);
 }
 
 // Get all the download entries from the database.
 void HistoryBackend::QueryDownloads(
-    scoped_refptr<DownloadQueryRequest> request) {
-  if (request->canceled())
-    return;
+    const HistoryService::DownloadQueryCallback& callback) {
+  scoped_ptr<std::vector<DownloadPersistentStoreInfo> > results(
+      new std::vector<DownloadPersistentStoreInfo>());

[Randy Smith (Not in Mondays), 2012/09/11 18:36:53]

Random thought: Probably worthwhile making sure you do a valgrind trybot run
before landing.

[benjhayden, 2012/09/13 15:18:16]

TODOne

   if (db_.get())
-    db_->QueryDownloads(&request->value);
-  request->ForwardResult(&request->value);
+    db_->QueryDownloads(results.get());
+  callback.Run(results.Pass());
 }
 
 // Clean up entries that has been corrupted (because of the crash, for example).
 void HistoryBackend::CleanUpInProgressEntries() {
   if (db_.get()) {
     // If some "in progress" entries were not updated when Chrome exited, they
     // need to be cleaned up.
     db_->CleanUpInProgressEntries();
   }
 }
 
 // Update a particular download entry.
 void HistoryBackend::UpdateDownload(
-    const content::DownloadPersistentStoreInfo& data) {
+    const DownloadPersistentStoreInfo& data) {
   if (db_.get())
     db_->UpdateDownload(data);
 }
 
-// Update the path of a particular download entry.
-void HistoryBackend::UpdateDownloadPath(const FilePath& path,
-                                        int64 db_handle) {
+// Create a new download entry and pass back the db_handle to it.
+void HistoryBackend::CreateDownload(
+    const DownloadPersistentStoreInfo& history_info,
+    const HistoryService::DownloadCreateCallback& callback) {
+  int64 db_handle = 0;
   if (db_.get())
-    db_->UpdateDownloadPath(path, db_handle);
+    db_handle = db_->CreateDownload(history_info);
+  callback.Run(db_handle);
 }
 
-// Create a new download entry and pass back the db_handle to it.
-void HistoryBackend::CreateDownload(
-    scoped_refptr<DownloadCreateRequest> request,
-    int32 id,
-    const content::DownloadPersistentStoreInfo& history_info) {
-  int64 db_handle = 0;
-  if (!request->canceled()) {
-    if (db_.get())
-      db_handle = db_->CreateDownload(history_info);
-    request->ForwardResult(id, db_handle);
-  }
+void HistoryBackend::GetVisibleVisitCountToHostSimple(
+    const GURL& url,
+    const HistoryService::GetVisibleVisitCountToHostSimpleCallback& callback) {
+  int count = 0;
+  Time first_visit;
+  const bool success = db_.get() &&
+      db_->GetVisibleVisitCountToHost(url, &count, &first_visit);
+  callback.Run(success, count, first_visit);
 }
 
-void HistoryBackend::RemoveDownload(int64 db_handle) {
+void HistoryBackend::RemoveDownloads(const std::set<int64>& handles) {
   if (db_.get())
-    db_->RemoveDownload(db_handle);
-}
-
-void HistoryBackend::RemoveDownloadsBetween(const Time remove_begin,
-                                            const Time remove_end) {
-  if (db_.get())
-    db_->RemoveDownloadsBetween(remove_begin, remove_end);
+    db_->RemoveDownloads(handles);
 }
 
 void HistoryBackend::QueryHistory(scoped_refptr<QueryHistoryRequest> request,
                                   const string16& text_query,
                                   const QueryOptions& options) {
   if (request->canceled())
     return;
 
   TimeTicks beginning_time = TimeTicks::Now();
 
@@ skipping 1040 matching lines @@
       // Removing the icon mapping may have orphaned the associated favicon so
       // we must recheck it. This is not super fast, but this case will get
       // triggered rarely, since normally a page will always map to the same
       // favicon IDs. It will mostly happen for favicons we import.
       if (!thumbnail_db_->HasMappingFor(m->icon_id))
         thumbnail_db_->DeleteFavicon(m->icon_id);
       mappings_changed = true;
     }
   }
 
-  for (size_t i = 0; i < unmapped_icon_ids.size(); ++i ) {
+  for (size_t i = 0; i < unmapped_icon_ids.size(); ++i) {
     thumbnail_db_->AddIconMapping(page_url, unmapped_icon_ids[i]);
     mappings_changed = true;
   }
   return mappings_changed;
 }
 
 void HistoryBackend::Commit() {
   if (!db_.get())
     return;
 
@@ skipping 379 matching lines @@
   info.url_id = visit.url_id;
   info.time = visit.visit_time;
   info.transition = visit.transition;
   // If we don't have a delegate yet during setup or shutdown, we will drop
   // these notifications.
   if (delegate_.get())
     delegate_->NotifyVisitDBObserversOnAddVisit(info);
 }
 
 }  // namespace history