chrome.experimental.downloads

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>
@@ skipping 1065 matching lines @@
 
 // Downloads -------------------------------------------------------------------
 
 // Get all the download entries from the database.
 void HistoryBackend::QueryDownloads(
     scoped_refptr<DownloadQueryRequest> request) {
   if (request->canceled())
     return;
   if (db_.get())
     db_->QueryDownloads(&request->value);
-  request->ForwardResult(DownloadQueryRequest::TupleType(&request->value));
+  request->ForwardResult(DownloadQueryRequest::TupleType(&request->value.results));
 }
 
 // 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();
   }
 }
@@ skipping 11 matching lines @@
                                         int64 db_handle) {
   if (db_.get())
     db_->UpdateDownloadPath(path, 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 DownloadHistoryInfo& history_info) {
-  int64 db_handle = 0;
   if (!request->canceled()) {
-    if (db_.get())
-      db_handle = db_->CreateDownload(history_info);
-    request->ForwardResult(DownloadCreateRequest::TupleType(id, db_handle));
+    if (db_.get()) {
+      bool success = db_->CreateDownload(history_info);
+      DCHECK(success) << history_info.id;
+    }
+    request->ForwardResult(DownloadCreateRequest::TupleType(id));
   }
 }
 
 void HistoryBackend::RemoveDownload(int64 db_handle) {
   if (db_.get())
     db_->RemoveDownload(db_handle);
 }
 
 void HistoryBackend::RemoveDownloadsBetween(const Time remove_begin,
                                             const Time remove_end) {
@@ skipping 1096 matching lines @@
   return true;
 }
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history