Add mime type information to the download database

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 96 matching lines @@
     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->GetMimeType(),
+      item->GetOriginalMimeType(),
       item->GetStartTime(),
       item->GetEndTime(),
       item->GetETag(),
       item->GetLastModifiedTime(),
       item->GetReceivedBytes(),
       item->GetTotalBytes(),
       item->GetState(),
       item->GetDangerType(),
       item->GetLastReason(),
       item->GetId(),
       item->GetOpened(),
       by_ext_id,
       by_ext_name);
 }
 
 bool ShouldUpdateHistory(const history::DownloadRow* previous,
                          const history::DownloadRow& current) {
-  // Ignore url, referrer, start_time, id, which don't change.
+  // Ignore url, referrer, mime_type, original_mime_type, start_time,
+  // id, db_handle, 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) ||
           (previous->received_bytes != current.received_bytes) ||
           (previous->total_bytes != current.total_bytes) ||
           (previous->etag != current.etag) ||
           (previous->last_modified != current.last_modified) ||
           (previous->state != current.state) ||
           (previous->danger_type != current.danger_type) ||
@@ skipping 83 matching lines @@
     return;
   for (InfoVector::const_iterator it = infos->begin();
        it != infos->end(); ++it) {
     loading_id_ = it->id;
     content::DownloadItem* item = notifier_.GetManager()->CreateDownloadItem(
         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->state,
         it->danger_type,
         it->interrupt_reason,
         it->opened);
@@ skipping 174 matching lines @@
   removing_ids_.insert(download_id);
 }
 
 void DownloadHistory::RemoveDownloadsBatch() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   IdSet remove_ids;
   removing_ids_.swap(remove_ids);
   history_->RemoveDownloads(remove_ids);
   FOR_EACH_OBSERVER(Observer, observers_, OnDownloadsRemoved(remove_ids));
 }