Remove dependency on //content from history DownloadDatabase

chrome/browser/history/history_unittest.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.
 
 // History unit tests come in two flavors:
 //
 // 1. The more complicated style is that the unit test creates a full history
 //    service. This spawns a background thread for the history backend, and
 //    all communication is asynchronous. This is useful for testing more
 //    complicated things or end-to-end behavior.
@@ skipping 24 matching lines @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
-#include "chrome/browser/history/download_row.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_unittest_base.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
+#include "components/history/content/browser/download_constants_utils.h"
+#include "components/history/core/browser/download_constants.h"
+#include "components/history/core/browser/download_row.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/in_memory_database.h"
 #include "components/history/core/browser/page_usage_data.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
@@ skipping 105 matching lines @@
   void TearDown() override {
     DeleteBackend();
 
     // Make sure we don't have any event pending that could disrupt the next
     // test.
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
     base::MessageLoop::current()->Run();
   }
 
-  bool AddDownload(uint32 id,
-                   DownloadItem::DownloadState state,
-                   const Time& time) {
+  bool AddDownload(uint32 id, DownloadState state, const Time& time) {
     std::vector<GURL> url_chain;
     url_chain.push_back(GURL("foo-url"));
 
     DownloadRow download(base::FilePath(FILE_PATH_LITERAL("current-path")),
                          base::FilePath(FILE_PATH_LITERAL("target-path")),
                          url_chain,
                          GURL("http://referrer.com/"),
                          "application/vnd.oasis.opendocument.text",
                          "application/octet-stream",
                          time,
                          time,
                          std::string(),
                          std::string(),
                          0,
                          512,
                          state,
-                         content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                         content::DOWNLOAD_INTERRUPT_REASON_NONE,
+                         DownloadDangerType::NOT_DANGEROUS,
+                         ToHistoryDownloadInterruptReason(
+                            content::DOWNLOAD_INTERRUPT_REASON_NONE),
                          id,
                          false,
                          "by_ext_id",
                          "by_ext_name");
     return db_->CreateDownload(download);
   }
 
   base::ScopedTempDir temp_dir_;
 
   base::MessageLoopForUI message_loop_;
@@ skipping 29 matching lines @@
 
   // Initially there should be nothing in the downloads database.
   std::vector<DownloadRow> downloads;
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(0U, downloads.size());
 
   // Add a download, test that it was added correctly, remove it, test that it
   // was removed.
   Time now = Time();
   uint32 id = 1;
-  EXPECT_TRUE(AddDownload(id, DownloadItem::COMPLETE, Time()));
+  EXPECT_TRUE(AddDownload(id, DownloadState::COMPLETE, Time()));
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(1U, downloads.size());
 
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("current-path")),
             downloads[0].current_path);
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("target-path")),
             downloads[0].target_path);
   EXPECT_EQ(1UL, downloads[0].url_chain.size());
   EXPECT_EQ(GURL("foo-url"), downloads[0].url_chain[0]);
   EXPECT_EQ(std::string("http://referrer.com/"),
             std::string(downloads[0].referrer_url.spec()));
   EXPECT_EQ(now, downloads[0].start_time);
   EXPECT_EQ(now, downloads[0].end_time);
   EXPECT_EQ(0, downloads[0].received_bytes);
   EXPECT_EQ(512, downloads[0].total_bytes);
-  EXPECT_EQ(DownloadItem::COMPLETE, downloads[0].state);
-  EXPECT_EQ(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-            downloads[0].danger_type);
+  EXPECT_EQ(DownloadState::COMPLETE, downloads[0].state);
+  EXPECT_EQ(DownloadDangerType::NOT_DANGEROUS, downloads[0].danger_type);
   EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE,
             downloads[0].interrupt_reason);
   EXPECT_FALSE(downloads[0].opened);
   EXPECT_EQ("by_ext_id", downloads[0].by_ext_id);
   EXPECT_EQ("by_ext_name", downloads[0].by_ext_name);
   EXPECT_EQ("application/vnd.oasis.opendocument.text", downloads[0].mime_type);
   EXPECT_EQ("application/octet-stream", downloads[0].original_mime_type);
 
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(1U, downloads.size());
@@ skipping 440 matching lines @@
 }
 
 TEST_F(HistoryBackendDBTest, ConfirmDownloadRowCreateAndDelete) {
   // Create the DB.
   CreateBackendAndDatabase();
 
   base::Time now(base::Time::Now());
 
   // Add some downloads.
   uint32 id1 = 1, id2 = 2, id3 = 3;
-  AddDownload(id1, DownloadItem::COMPLETE, now);
-  AddDownload(id2, DownloadItem::COMPLETE, now + base::TimeDelta::FromDays(2));
-  AddDownload(id3, DownloadItem::COMPLETE, now - base::TimeDelta::FromDays(2));
+  AddDownload(id1, DownloadState::COMPLETE, now);
+  AddDownload(id2, DownloadState::COMPLETE, now + base::TimeDelta::FromDays(2));
+  AddDownload(id3, DownloadState::COMPLETE, now - base::TimeDelta::FromDays(2));
 
   // Confirm that resulted in the correct number of rows in the DB.
   DeleteBackend();
   {
     sql::Connection db;
     ASSERT_TRUE(db.Open(history_dir_.Append(kHistoryFilename)));
     sql::Statement statement(db.GetUniqueStatement(
         "Select Count(*) from downloads"));
     EXPECT_TRUE(statement.Step());
     EXPECT_EQ(3, statement.ColumnInt(0));
@@ skipping 33 matching lines @@
                        url_chain,
                        GURL(std::string()),
                        "application/octet-stream",
                        "application/octet-stream",
                        now,
                        now,
                        std::string(),
                        std::string(),
                        0,
                        512,
-                       DownloadItem::COMPLETE,
-                       content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                       content::DOWNLOAD_INTERRUPT_REASON_NONE,
+                       DownloadState::COMPLETE,
+                       DownloadDangerType::NOT_DANGEROUS,
+                       ToHistoryDownloadInterruptReason(
+                          content::DOWNLOAD_INTERRUPT_REASON_NONE),
                        1,
                        0,
                        "by_ext_id",
                        "by_ext_name");
 
   // Creating records without any urls should fail.
   EXPECT_FALSE(db_->CreateDownload(download));
 
   download.url_chain.push_back(GURL("foo-url"));
   EXPECT_TRUE(db_->CreateDownload(download));
@@ skipping 26 matching lines @@
   }
 }
 
 TEST_F(HistoryBackendDBTest, ConfirmDownloadInProgressCleanup) {
   // Create the DB.
   CreateBackendAndDatabase();
 
   base::Time now(base::Time::Now());
 
   // Put an IN_PROGRESS download in the DB.
-  AddDownload(1, DownloadItem::IN_PROGRESS, now);
+  AddDownload(1, DownloadState::IN_PROGRESS, now);
 
   // Confirm that they made it into the DB unchanged.
   DeleteBackend();
   {
     sql::Connection db;
     ASSERT_TRUE(db.Open(history_dir_.Append(kHistoryFilename)));
     sql::Statement statement(db.GetUniqueStatement(
         "Select Count(*) from downloads"));
     EXPECT_TRUE(statement.Step());
     EXPECT_EQ(1, statement.ColumnInt(0));
 
     sql::Statement statement1(db.GetUniqueStatement(
         "Select state, interrupt_reason from downloads"));
     EXPECT_TRUE(statement1.Step());
-    EXPECT_EQ(DownloadDatabase::kStateInProgress, statement1.ColumnInt(0));
+    EXPECT_EQ(DownloadStateToInt(DownloadState::IN_PROGRESS),
+              statement1.ColumnInt(0));
     EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE, statement1.ColumnInt(1));
     EXPECT_FALSE(statement1.Step());
   }
 
   // Read in the DB through query downloads, then test that the
   // right transformation was returned.
   CreateBackendAndDatabase();
   std::vector<DownloadRow> results;
   db_->QueryDownloads(&results);
   ASSERT_EQ(1u, results.size());
-  EXPECT_EQ(content::DownloadItem::INTERRUPTED, results[0].state);
+  EXPECT_EQ(DownloadState::INTERRUPTED, results[0].state);
   EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_CRASH,
             results[0].interrupt_reason);
 
   // Allow the update to propagate, shut down the DB, and confirm that
   // the query updated the on disk database as well.
   base::MessageLoop::current()->RunUntilIdle();
   DeleteBackend();
   {
     sql::Connection db;
     ASSERT_TRUE(db.Open(history_dir_.Append(kHistoryFilename)));
     sql::Statement statement(db.GetUniqueStatement(
         "Select Count(*) from downloads"));
     EXPECT_TRUE(statement.Step());
     EXPECT_EQ(1, statement.ColumnInt(0));
 
     sql::Statement statement1(db.GetUniqueStatement(
         "Select state, interrupt_reason from downloads"));
     EXPECT_TRUE(statement1.Step());
-    EXPECT_EQ(DownloadDatabase::kStateInterrupted, statement1.ColumnInt(0));
+    EXPECT_EQ(DownloadStateToInt(DownloadState::INTERRUPTED),
+              statement1.ColumnInt(0));
     EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_CRASH,
               statement1.ColumnInt(1));
     EXPECT_FALSE(statement1.Step());
   }
 }
 
 struct InterruptReasonAssociation {
   std::string name;
   int value;
 };
@@ skipping 973 matching lines @@
   std::vector<PageUsageData*> results;
   db_->QuerySegmentUsage(segment_time, 10, &results);
   ASSERT_EQ(1u, results.size());
   EXPECT_EQ(url, results[0]->GetURL());
   EXPECT_EQ(segment_id, results[0]->GetID());
   EXPECT_EQ(title, results[0]->GetTitle());
   STLDeleteElements(&results);
 }
 
 }  // namespace history