WIP - Refactor programmatic downloads

content/public/test/download_test_observer.h

Index: content/public/test/download_test_observer.h
diff --git a/content/public/test/download_test_observer.h b/content/public/test/download_test_observer.h
index 5bc39fe0087bc70b6bed17eb3ab1c6c211641c39..45fd947553c780209963f32bc4c45c8731c44c24 100644
--- a/content/public/test/download_test_observer.h
+++ b/content/public/test/download_test_observer.h
@@ -11,10 +11,10 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.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_url_parameters.h"
-#include "net/base/net_errors.h"
 
 namespace content {
 
@@ -281,9 +281,11 @@ class DownloadTestItemCreationObserver
   void WaitForDownloadItemCreation();
 
   uint32 download_id() const { return download_id_; }
-  net::Error error() const { return error_; }
+  DownloadInterruptReason interrupt_reason() const { return interrupt_reason_; }
   bool started() const { return called_back_count_ > 0; }
-  bool succeeded() const { return started() && (error_ == net::OK); }
+  bool succeeded() const {
+    return started() && interrupt_reason_ == DOWNLOAD_INTERRUPT_REASON_NONE;
+  }
 
   const DownloadUrlParameters::OnStartedCallback callback();
 
@@ -292,11 +294,12 @@ class DownloadTestItemCreationObserver
 
   ~DownloadTestItemCreationObserver();
 
-  void DownloadItemCreationCallback(DownloadItem* item, net::Error error);
+  void DownloadItemCreationCallback(DownloadItem* item,
+                                    DownloadInterruptReason interrupt_reason);
 
   // The download creation information we received.
   uint32 download_id_;
-  net::Error error_;
+  DownloadInterruptReason interrupt_reason_;
 
   // Count of callbacks.
   size_t called_back_count_;