[Download] Return DownloadInterruptReason from OnStartedCallback

chrome/browser/download/download_browsertest.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.
 
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 45 matching lines @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #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"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
@@ skipping 261 matching lines @@
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewContextMenu);
 };
 
 bool WasAutoOpened(DownloadItem* item) {
   return item->GetAutoOpened();
 }
 
 // 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);
 }
 
 // Callback for HistoryObserver; used in DownloadHistoryCheck
 bool HasDataAndName(const history::DownloadRow& row) {
   return row.received_bytes > 0 && !row.target_path.empty();
 }
 
 }  // namespace
 
@@ skipping 505 matching lines @@
   void DownloadFilesCheckErrorsLoopBody(const DownloadInfo& download_info,
                                         size_t i) {
     std::stringstream s;
     s << " " << __FUNCTION__ << "()"
       << " index = " << i
       << " url = '" << download_info.url_name << "'"
       << " method = "
       << ((download_info.download_method == DOWNLOAD_DIRECT) ?
           "DOWNLOAD_DIRECT" : "DOWNLOAD_NAVIGATE")
       << " show_item = " << download_info.show_download_item
-      << " reason = "
-      << InterruptReasonDebugString(download_info.reason);
+      << " reason = " << DownloadInterruptReasonToString(download_info.reason);
 
     std::vector<DownloadItem*> download_items;
     GetDownloads(browser(), &download_items);
     size_t downloads_expected = download_items.size();
 
     std::string server_path = "files/downloads/";
     server_path += download_info.url_name;
     GURL url = test_server()->GetURL(server_path);
     ASSERT_TRUE(url.is_valid()) << s.str();
 
@@ skipping 18 matching lines @@
       params->set_callback(creation_observer->callback());
       DownloadManagerForBrowser(browser())->DownloadUrl(params.Pass());
 
       // Wait until the item is created, or we have determined that it
       // won't be.
       creation_observer->WaitForDownloadItemCreation();
 
       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());
       }
     } else {
       // Navigate to URL normally, wait until done.
       ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
                                                                 url,
                                                                 1);
     }
 
@@ skipping 65 matching lines @@
   }
 
   void DownloadInsertFilesErrorCheckErrorsLoopBody(
       scoped_refptr<content::TestFileErrorInjector> injector,
       const FileErrorInjectInfo& info,
       size_t i) {
     std::stringstream s;
     s << " " << __FUNCTION__ << "()"
       << " index = " << i
       << " url = " << info.error_info.url
-      << " operation code = " <<
-          content::TestFileErrorInjector::DebugString(
-              info.error_info.code)
+      << " operation code = "
+      << content::TestFileErrorInjector::DebugString(info.error_info.code)
       << " instance = " << info.error_info.operation_instance
-      << " error = " << content::InterruptReasonDebugString(
-         info.error_info.error);
+      << " error = "
+      << content::DownloadInterruptReasonToString(info.error_info.error);
 
     injector->ClearErrors();
     injector->AddError(info.error_info);
 
     injector->InjectErrors();
 
     DownloadFilesCheckErrorsLoopBody(info.download_info, i);
 
     size_t expected_successes = info.download_info.show_download_item ? 1u : 0u;
     EXPECT_EQ(expected_successes, injector->TotalFileCount()) << s.str();
@@ skipping 2221 matching lines @@
 
   // No errors this time. The download should complete successfully.
   EXPECT_FALSE(completion_observer->IsFinished());
   completion_observer->StartObserving();
   download->Resume();
   completion_observer->WaitForFinished();
   EXPECT_EQ(DownloadItem::COMPLETE, download->GetState());
 
   EXPECT_FALSE(DidShowFileChooser());
 }