Added callback to DownloadUrl() so we can find download failures.

content/browser/download/download_manager_impl.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 "content/browser/download/download_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 40 matching lines @@
 using content::DownloadId;
 using content::DownloadItem;
 using content::DownloadPersistentStoreInfo;
 using content::ResourceDispatcherHostImpl;
 using content::WebContents;
 
 namespace {
 
 // Param structs exist because base::Bind can only handle 6 args.
 struct URLParams {
-  URLParams(const GURL& url, const GURL& referrer, int64 post_id)
-    : url_(url), referrer_(referrer), post_id_(post_id) {}
+  URLParams(const GURL& url, const GURL& referrer, int64 post_id, bool cache)
+    : url_(url), referrer_(referrer), post_id_(post_id), prefer_cache_(cache) {}
   GURL url_;
   GURL referrer_;
   int64 post_id_;
+  bool prefer_cache_;
 };
 
 struct RenderParams {
   RenderParams(int rpi, int rvi)
     : render_process_id_(rpi), render_view_id_(rvi) {}
   int render_process_id_;
   int render_view_id_;
 };
 
-void BeginDownload(const URLParams& url_params,
-                   bool prefer_cache,
-                   const DownloadSaveInfo& save_info,
-                   ResourceDispatcherHostImpl* resource_dispatcher_host,
-                   const RenderParams& render_params,
-                   content::ResourceContext* context) {
+void BeginDownload(
+    const URLParams& url_params,
+    const DownloadSaveInfo& save_info,
+    ResourceDispatcherHostImpl* resource_dispatcher_host,
+    const RenderParams& render_params,
+    content::ResourceContext* context,
+    const content::DownloadManager::OnStartedCallback& callback) {
   scoped_ptr<net::URLRequest> request(
       new net::URLRequest(url_params.url_, resource_dispatcher_host));
   request->set_referrer(url_params.referrer_.spec());
   if (url_params.post_id_ >= 0) {
     // The POST in this case does not have an actual body, and only works
     // when retrieving data from cache. This is done because we don't want
     // to do a re-POST without user consent, and currently don't have a good
     // plan on how to display the UI for that.
-    DCHECK(prefer_cache);
+    DCHECK(url_params.prefer_cache_);
     request->set_method("POST");
     scoped_refptr<net::UploadData> upload_data = new net::UploadData();
     upload_data->set_identifier(url_params.post_id_);
     request->set_upload(upload_data);
   }
   resource_dispatcher_host->BeginDownload(
       request.Pass(),
       context,
       render_params.render_process_id_,
       render_params.render_view_id_,
-      prefer_cache,
+      url_params.prefer_cache_,
       save_info,
-      ResourceDispatcherHostImpl::DownloadStartedCallback());
+      callback);
 }
 
 class MapValueIteratorAdapter {
  public:
   explicit MapValueIteratorAdapter(
       base::hash_map<int64, DownloadItem*>::const_iterator iter)
     : iter_(iter) {
   }
   ~MapValueIteratorAdapter() {}
 
@@ skipping 746 matching lines @@
 // Initiate a download of a specific URL. We send the request to the
 // ResourceDispatcherHost, and let it send us responses like a regular
 // download.
 void DownloadManagerImpl::DownloadUrl(
     const GURL& url,
     const GURL& referrer,
     const std::string& referrer_charset,
     bool prefer_cache,
     int64 post_id,
     const DownloadSaveInfo& save_info,
-    WebContents* web_contents) {
+    WebContents* web_contents,
+    const OnStartedCallback& callback) {
   ResourceDispatcherHostImpl* resource_dispatcher_host =
       ResourceDispatcherHostImpl::Get();
   DCHECK(resource_dispatcher_host);
 
   // We send a pointer to content::ResourceContext, instead of the usual
   // reference, so that a copy of the object isn't made.
   // base::Bind can't handle 7 args, so we use URLParams and RenderParams.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &BeginDownload,
-          URLParams(url, referrer, post_id),
-          prefer_cache,
+          URLParams(url, referrer, post_id, prefer_cache),
           save_info,
           resource_dispatcher_host,
           RenderParams(web_contents->GetRenderProcessHost()->GetID(),
                        web_contents->GetRenderViewHost()->GetRoutingID()),
-          web_contents->GetBrowserContext()->GetResourceContext()));
+          web_contents->GetBrowserContext()->GetResourceContext(),
+          callback));
 }
 
 void DownloadManagerImpl::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
   // TODO: It is the responsibility of the observers to query the
   // DownloadManager. Remove the following call from here and update all
   // observers.
   observer->ModelChanged(this);
 }
 
@@ skipping 303 matching lines @@
     if (it->second->IsComplete() && !it->second->GetOpened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }
 
 void DownloadManagerImpl::SetFileManagerForTesting(
       DownloadFileManager* file_manager) {
   file_manager_ = file_manager;
 }