WIP - Refactor programmatic downloads

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 3839ca8a91917cdf11f72f4a8f9a2c44c624e96b..a6758ffe70993630fe9756fa44efe6e2fbf54acb 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -62,6 +62,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_save_info.h"
@@ -368,7 +369,8 @@ bool WasAutoOpened(DownloadItem* item) {
 }
 
 // Called when a download starts. Marks the download as hidden.
-void SetHiddenDownloadCallback(DownloadItem* item, net::Error error) {
+void SetHiddenDownloadCallback(DownloadItem* item,
+                               content::DownloadInterruptReason reason) {
   DownloadItemModel(item).SetShouldShowInShelf(false);
 }
 
@@ -874,7 +876,7 @@ class DownloadTest : public InProcessBrowserTest {
           "DOWNLOAD_DIRECT" : "DOWNLOAD_NAVIGATE")
       << " show_item = " << download_info.show_download_item
       << " reason = "
-      << InterruptReasonDebugString(download_info.reason);
+      << DownloadInterruptReasonToString(download_info.reason);
 
     std::vector<DownloadItem*> download_items;
     GetDownloads(browser(), &download_items);
@@ -913,11 +915,13 @@ class DownloadTest : public InProcessBrowserTest {
       EXPECT_EQ(download_info.show_download_item,
                 creation_observer->succeeded());
       if (download_info.show_download_item) {
-        EXPECT_EQ(net::OK, creation_observer->error());
+        EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE,
+                  creation_observer->interrupt_reason());
         EXPECT_NE(content::DownloadItem::kInvalidId,
                   creation_observer->download_id());
       } else {
-        EXPECT_NE(net::OK, creation_observer->error());
+        EXPECT_NE(content::DOWNLOAD_INTERRUPT_REASON_NONE,
+                  creation_observer->interrupt_reason());
         EXPECT_EQ(content::DownloadItem::kInvalidId,
                   creation_observer->download_id());
       }
@@ -1007,7 +1011,7 @@ class DownloadTest : public InProcessBrowserTest {
           content::TestFileErrorInjector::DebugString(
               info.error_info.code)
       << " instance = " << info.error_info.operation_instance
-      << " error = " << content::InterruptReasonDebugString(
+      << " error = " << content::DownloadInterruptReasonToString(
          info.error_info.error);
 
     injector->ClearErrors();