[Download] Return DownloadInterruptReason from OnStartedCallback

chrome/browser/plugins/plugin_installer.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 "chrome/browser/plugins/plugin_installer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/process/process.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugins/plugin_installer_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_save_info.h"
+#include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::ResourceDispatcherHost;
 
 namespace {
 
 void BeginDownload(
     const GURL& url,
     content::ResourceContext* resource_context,
     int render_process_host_id,
     int render_view_host_routing_id,
     const ResourceDispatcherHost::DownloadStartedCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   ResourceDispatcherHost* rdh = ResourceDispatcherHost::Get();
   scoped_ptr<net::URLRequest> request(
       resource_context->GetRequestContext()->CreateRequest(
           url, net::DEFAULT_PRIORITY, NULL));
-  net::Error error = rdh->BeginDownload(
+  content::DownloadInterruptReason error = rdh->BeginDownload(
       request.Pass(),
       content::Referrer(),
       false,  // is_content_initiated
       resource_context,
       render_process_host_id,
       render_view_host_routing_id,
       true,  // prefer_cache
       scoped_ptr<content::DownloadSaveInfo>(new content::DownloadSaveInfo()),
       content::DownloadItem::kInvalidId,
       callback);
 
-  if (error != net::OK) {
+  if (error != content::DOWNLOAD_INTERRUPT_REASON_NONE) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(callback, static_cast<DownloadItem*>(NULL), error));
   }
 }
 
 }  // namespace
 
 PluginInstaller::PluginInstaller()
     : state_(INSTALLER_STATE_IDLE),
@@ skipping 14 matching lines @@
       FOR_EACH_OBSERVER(PluginInstallerObserver, observers_,
                         DownloadFinished());
       break;
     }
     case DownloadItem::CANCELLED: {
       DownloadCancelled();
       break;
     }
     case DownloadItem::INTERRUPTED: {
       content::DownloadInterruptReason reason = download->GetLastReason();
-      DownloadError(content::InterruptReasonDebugString(reason));
+      DownloadError(content::DownloadInterruptReasonToString(reason));
       break;
     }
     case DownloadItem::MAX_DOWNLOAD_STATE: {
       NOTREACHED();
       return;
     }
   }
   download->RemoveObserver(this);
 }
 
@@ skipping 38 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BeginDownload,
                  plugin_url,
                  profile->GetResourceContext(),
                  web_contents->GetRenderProcessHost()->GetID(),
                  web_contents->GetRenderViewHost()->GetRoutingID(),
                  base::Bind(&PluginInstaller::DownloadStarted,
                             base::Unretained(this))));
 }
 
-void PluginInstaller::DownloadStarted(content::DownloadItem* item,
-                                      net::Error error) {
+void PluginInstaller::DownloadStarted(
+    content::DownloadItem* item,
+    content::DownloadInterruptReason interrupt_reason) {
   if (!item) {
-    DCHECK_NE(net::OK, error);
-    std::string msg =
-        base::StringPrintf("Error %d: %s", error, net::ErrorToString(error));
+    DCHECK_NE(content::DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason);
+    std::string msg = base::StringPrintf(
+        "Error %d: %s",
+        interrupt_reason,
+        content::DownloadInterruptReasonToString(interrupt_reason).c_str());
     DownloadError(msg);
     return;
   }
-  DCHECK_EQ(net::OK, error);
+  DCHECK_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason);
   item->SetOpenWhenComplete(true);
   item->AddObserver(this);
 }
 
 void PluginInstaller::OpenDownloadURL(const GURL& plugin_url,
                                       content::WebContents* web_contents) {
   DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
   web_contents->OpenURL(content::OpenURLParams(
       plugin_url,
       content::Referrer(web_contents->GetURL(),
                         blink::WebReferrerPolicyDefault),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, false));
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadFinished());
 }
 
 void PluginInstaller::DownloadError(const std::string& msg) {
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg));
 }
 
 void PluginInstaller::DownloadCancelled() {
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled());
 }