[Downloads/History] Add tab-url and tab-referrer-url to DownloadRow

chrome/browser/download/download_history.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.
 
 // DownloadHistory manages persisting DownloadItems to the history service by
 // observing a single DownloadManager and all its DownloadItems using an
 // AllDownloadItemNotifier.
 //
 // DownloadHistory decides whether and when to add items to, remove items from,
 // and update items in the database. DownloadHistory uses DownloadHistoryData to
@@ skipping 109 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
   extensions::DownloadedByExtension* by_ext =
       extensions::DownloadedByExtension::Get(item);
   if (by_ext) {
     by_ext_id = by_ext->id();
     by_ext_name = by_ext->name();
   }
 #endif
 
   return history::DownloadRow(
-      item->GetFullPath(),
-      item->GetTargetFilePath(),
-      item->GetUrlChain(),
-      item->GetReferrerUrl(),
+      item->GetFullPath(), item->GetTargetFilePath(), item->GetUrlChain(),
+      item->GetReferrerUrl(), item->GetTabUrl(), item->GetTabReferrerUrl(),
       std::string(),  // HTTP method (not available yet)
-      item->GetMimeType(),
-      item->GetOriginalMimeType(),
-      item->GetStartTime(),
-      item->GetEndTime(),
-      item->GetETag(),
-      item->GetLastModifiedTime(),
-      item->GetReceivedBytes(),
-      item->GetTotalBytes(),
+      item->GetMimeType(), item->GetOriginalMimeType(), item->GetStartTime(),
+      item->GetEndTime(), item->GetETag(), item->GetLastModifiedTime(),
+      item->GetReceivedBytes(), item->GetTotalBytes(),
       history::ToHistoryDownloadState(item->GetState()),
       history::ToHistoryDownloadDangerType(item->GetDangerType()),
       history::ToHistoryDownloadInterruptReason(item->GetLastReason()),
       std::string(),  // Hash value (not available yet)
-      history::ToHistoryDownloadId(item->GetId()),
-      item->GetGuid(),
-      item->GetOpened(),
-      by_ext_id,
-      by_ext_name);
+      history::ToHistoryDownloadId(item->GetId()), item->GetGuid(),
+      item->GetOpened(), by_ext_id, by_ext_name);
 }
 
 bool ShouldUpdateHistory(const history::DownloadRow* previous,
                          const history::DownloadRow& current) {
   // Ignore url_chain, referrer, http_method, mime_type, original_mime_type,
   // start_time, id, guid, which don't change.
   return ((previous == NULL) ||
           (previous->current_path != current.current_path) ||
           (previous->target_path != current.target_path) ||
           (previous->end_time != current.end_time) ||
@@ skipping 103 matching lines @@
 
 void DownloadHistory::QueryCallback(std::unique_ptr<InfoVector> infos) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // ManagerGoingDown() may have happened before the history loaded.
   if (!notifier_.GetManager())
     return;
   for (InfoVector::const_iterator it = infos->begin();
        it != infos->end(); ++it) {
     loading_id_ = history::ToContentDownloadId(it->id);
     content::DownloadItem* item = notifier_.GetManager()->CreateDownloadItem(
-        it->guid,
-        loading_id_,
-        it->current_path,
-        it->target_path,
-        it->url_chain,
-        it->referrer_url,
-        it->mime_type,
-        it->original_mime_type,
-        it->start_time,
-        it->end_time,
-        it->etag,
-        it->last_modified,
-        it->received_bytes,
-        it->total_bytes,
+        it->guid, loading_id_, it->current_path, it->target_path, it->url_chain,
+        it->referrer_url, it->tab_url, it->tab_referrer_url, it->mime_type,
+        it->original_mime_type, it->start_time, it->end_time, it->etag,
+        it->last_modified, it->received_bytes, it->total_bytes,
         std::string(),  // TODO(asanka): Need to persist and restore hash of
                         // partial file for an interrupted download. No need to
                         // store hash for a completed file.
         history::ToContentDownloadState(it->state),
         history::ToContentDownloadDangerType(it->danger_type),
         history::ToContentDownloadInterruptReason(it->interrupt_reason),
         it->opened);
 #if defined(ENABLE_EXTENSIONS)
     if (!it->by_ext_id.empty() && !it->by_ext_name.empty()) {
       new extensions::DownloadedByExtension(
@@ skipping 176 matching lines @@
   removing_ids_.insert(download_id);
 }
 
 void DownloadHistory::RemoveDownloadsBatch() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   IdSet remove_ids;
   removing_ids_.swap(remove_ids);
   history_->RemoveDownloads(remove_ids);
   FOR_EACH_OBSERVER(Observer, observers_, OnDownloadsRemoved(remove_ids));
 }