Remove dependency on //content from history DownloadDatabase

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 12 matching lines @@
 // callback is called.  All callbacks are bound with a weak pointer to
 // DownloadHistory to prevent use-after-free bugs.
 // ChromeDownloadManagerDelegate owns DownloadHistory, and deletes it in
 // Shutdown(), which is called by DownloadManagerImpl::Shutdown() after all
 // DownloadItems are destroyed.
 
 #include "chrome/browser/download/download_history.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/download/download_crx_util.h"
-#include "chrome/browser/history/download_database.h"
-#include "chrome/browser/history/download_row.h"
 #include "chrome/browser/history/history_service.h"
+#include "components/history/content/browser/download_constants_utils.h"
+#include "components/history/core/browser/download_database.h"
+#include "components/history/core/browser/download_row.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/downloads/downloads_api.h"
 #endif
 
 namespace {
 
@@ skipping 82 matching lines @@
       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(),
+      history::ToHistoryDownloadState(item->GetState()),
+      history::ToHistoryDownloadDangerType(item->GetDangerType()),
+      history::ToHistoryDownloadInterruptReason(item->GetLastReason()),
+      history::ToHistoryDownloadId(item->GetId()),
       item->GetOpened(),
       by_ext_id,
       by_ext_name);
 }
 
 bool ShouldUpdateHistory(const history::DownloadRow* previous,
                          const history::DownloadRow& current) {
   // Ignore url, referrer, mime_type, original_mime_type, start_time,
   // id, db_handle, which don't change.
   return ((previous == NULL) ||
@@ skipping 98 matching lines @@
          download->GetId() == loading_id_;
 }
 
 void DownloadHistory::QueryCallback(scoped_ptr<InfoVector> infos) {
   DCHECK(content::BrowserThread::CurrentlyOn(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_ = it->id;
+    loading_id_ = history::ToContentDownloadId(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,
+        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(
           item, it->by_ext_id, it->by_ext_name);
       item->UpdateObservers();
     }
 #endif
     DCHECK_EQ(DownloadHistoryData::PERSISTED,
               DownloadHistoryData::Get(item)->state());
@@ skipping 167 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));
 }