For downloads requiring a user gesture, also require...

chrome/browser/download/download_history.cc

Index: chrome/browser/download/download_history.cc
===================================================================
--- chrome/browser/download/download_history.cc	(revision 86341)
+++ chrome/browser/download/download_history.cc	(working copy)
@@ -39,6 +39,25 @@
   hs->CleanUpInProgressEntries();
 }
 
+void DownloadHistory::CheckVisitedReferrerBefore(
+    int32 download_id,
+    const GURL& referrer_url,
+    VisitedBeforeDoneCallback* callback) {
+  DCHECK(callback);
+
+  if (referrer_url.is_valid()) {
+    HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+    if (hs) {
+      HistoryService::Handle handle = hs->GetVisitCountToHost(referrer_url,
+          &history_consumer_,
+          NewCallback(this, &DownloadHistory::OnGotVisitCountToHost));
+      visited_before_requests_[handle] = std::make_pair(download_id, callback);
+      return;
+    }
+  }
+  callback->Run(download_id, false);
+}
+
 void DownloadHistory::AddEntry(
     DownloadItem* download_item,
     HistoryService::DownloadCreateCallback* callback) {
@@ -52,7 +71,6 @@
   // handles, so we use a negative value. Eventually, they could overlap, but
   // you'd have to do enough downloading that your ISP would likely stab you in
   // the neck first. YMMV.
-  // TODO(paulg) see bug 958058. EXPLICIT_ACCESS below is wrong.

[Randy Smith (Not in Mondays), 2011/05/24 18:28:25]

What's the context for this elimination?  I was going to look at the bug, but it
looks large to be in our issue tracker.

[Peter Kasting, 2011/05/24 20:55:00]

The bug is from the internal Google tracker.  This dates from before when we had
proper incognito mode handling for downloads.  Now that we have such handling
these comments are no longer accurate or necessary.

   HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (download_item->is_otr() || download_item->is_extension_install() ||
       download_item->is_temporary() || !hs) {
@@ -74,7 +92,6 @@
   if (download_item->db_handle() <= kUninitializedHandle)
     return;
 
-  // TODO(paulg) see bug 958058. EXPLICIT_ACCESS below is wrong.
   HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (!hs)
     return;
@@ -90,7 +107,6 @@
   if (download_item->db_handle() <= kUninitializedHandle)
     return;
 
-  // TODO(paulg) see bug 958058. EXPLICIT_ACCESS below is wrong.
   HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->UpdateDownloadPath(new_path, download_item->db_handle());
@@ -101,7 +117,6 @@
   if (download_item->db_handle() <= kUninitializedHandle)
     return;
 
-  // TODO(paulg) see bug 958058. EXPLICIT_ACCESS below is wrong.
   HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->RemoveDownload(download_item->db_handle());
@@ -109,7 +124,6 @@
 
 void DownloadHistory::RemoveEntriesBetween(const base::Time remove_begin,
                                            const base::Time remove_end) {
-  // TODO(paulg) see bug 958058. EXPLICIT_ACCESS below is wrong.
   HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->RemoveDownloadsBetween(remove_begin, remove_end);
@@ -118,3 +132,17 @@
 int64 DownloadHistory::GetNextFakeDbHandle() {
   return next_fake_db_handle_--;
 }
+
+void DownloadHistory::OnGotVisitCountToHost(HistoryService::Handle handle,
+                                            bool found_visits,
+                                            int count,
+                                            base::Time first_visit) {
+  VisitedBeforeRequestsMap::iterator request =
+      visited_before_requests_.find(handle);
+  DCHECK(request != visited_before_requests_.end());
+  int32 download_id = request->second.first;
+  VisitedBeforeDoneCallback* callback = request->second.second;
+  visited_before_requests_.erase(request);
+  callback->Run(download_id, found_visits && count &&
+      (first_visit.LocalMidnight() < base::Time::Now().LocalMidnight()));
+}