Remove dependency on //content from history DownloadDatabase

components/history/core/browser/download_row.h

Index: components/history/core/browser/download_row.h
diff --git a/chrome/browser/history/download_row.h b/components/history/core/browser/download_row.h
similarity index 64%
rename from chrome/browser/history/download_row.h
rename to components/history/core/browser/download_row.h
index a0c094fb294af7369c42eb2e2ed686a791bed393..0553a6738a1be891a1d93901916fd4c807b609f2 100644
--- a/chrome/browser/history/download_row.h
+++ b/components/history/core/browser/download_row.h
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_HISTORY_DOWNLOAD_ROW_H_
-#define CHROME_BROWSER_HISTORY_DOWNLOAD_ROW_H_
+#ifndef COMPONENTS_HISTORY_CORE_BROWSER_DOWNLOAD_ROW_H_
+#define COMPONENTS_HISTORY_CORE_BROWSER_DOWNLOAD_ROW_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/time/time.h"
-#include "content/public/browser/download_danger_type.h"
-#include "content/public/browser/download_interrupt_reasons.h"
-#include "content/public/browser/download_item.h"
+#include "components/history/core/browser/download_types.h"
 #include "url/gurl.h"
 
 namespace history {
@@ -22,26 +20,25 @@ namespace history {
 // DownloadDatabase through the HistoryService.
 struct DownloadRow {
   DownloadRow();
-  DownloadRow(
-      const base::FilePath& current_path,
-      const base::FilePath& target_path,
-      const std::vector<GURL>& url_chain,
-      const GURL& referrer,
-      const std::string& mime_type,
-      const std::string& original_mime_type,
-      const base::Time& start,
-      const base::Time& end,
-      const std::string& etag,
-      const std::string& last_modified,
-      int64 received,
-      int64 total,
-      content::DownloadItem::DownloadState download_state,
-      content::DownloadDangerType danger_type,
-      content::DownloadInterruptReason interrupt_reason,
-      uint32 id,
-      bool download_opened,
-      const std::string& ext_id,
-      const std::string& ext_name);
+  DownloadRow(const base::FilePath& current_path,
+              const base::FilePath& target_path,
+              const std::vector<GURL>& url_chain,
+              const GURL& referrer,
+              const std::string& mime_type,
+              const std::string& original_mime_type,
+              const base::Time& start,
+              const base::Time& end,
+              const std::string& etag,
+              const std::string& last_modified,
+              int64 received,
+              int64 total,
+              DownloadState download_state,
+              DownloadDangerType danger_type,
+              DownloadInterruptReason interrupt_reason,
+              DownloadId id,
+              bool download_opened,
+              const std::string& ext_id,
+              const std::string& ext_name);
   ~DownloadRow();
 
   // The current path to the download (potentially different from final if
@@ -86,17 +83,16 @@ struct DownloadRow {
   int64 total_bytes;
 
   // The current state of the download.
-  content::DownloadItem::DownloadState state;
+  DownloadState state;
 
   // Whether and how the download is dangerous.
-  content::DownloadDangerType danger_type;
+  DownloadDangerType danger_type;
 
-  // The reason the download was interrupted, if
-  // state == DownloadItem::INTERRUPTED
-  content::DownloadInterruptReason interrupt_reason;
+  // The reason the download was interrupted, if state == kStateInterrupted.
+  DownloadInterruptReason interrupt_reason;
 
   // The id of the download in the database. Is not changed by UpdateDownload().
-  uint32 id;
+  DownloadId id;
 
   // Whether this download has ever been opened from the browser.
   bool opened;
@@ -108,4 +104,4 @@ struct DownloadRow {
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_HISTORY_DOWNLOAD_ROW_H_
+#endif  // COMPONENTS_HISTORY_CORE_BROWSER_DOWNLOAD_ROW_H_