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

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 665 matching lines @@
     return true;
   }
 
   // Attempts to download a file, based on information in |download_info|.
   void DownloadFileCheckErrors(const DownloadInfo& download_info) {
     ASSERT_TRUE(test_server()->Start());
     std::vector<DownloadItem*> download_items;
     GetDownloads(browser(), &download_items);
     ASSERT_TRUE(download_items.empty());
 
+    NullSelectFile(browser());
+
     std::string server_path = "files/downloads/";
     server_path += download_info.url_name;
     GURL url = test_server()->GetURL(server_path);
     ASSERT_TRUE(url.is_valid());
 
     DownloadManager* download_manager = DownloadManagerForBrowser(browser());
     scoped_ptr<DownloadTestObserverTerminal> observer(
         new DownloadTestObserverTerminal(
             download_manager,
             1,
-            true,                   // Bail on select file
+            false,  // Don't bail on select file.
             DownloadTestObserverTerminal::ON_DANGEROUS_DOWNLOAD_FAIL));
 
     if (download_info.download_method == DOWNLOAD_DIRECT) {
       // Go directly to download.
       WebContents* web_contents = browser()->GetSelectedWebContents();
       ASSERT_TRUE(web_contents);
       DownloadSaveInfo save_info;
       save_info.prompt_for_save_location = false;
 
+      scoped_refptr<DownloadTestItemCreationObserver> creation_observer(
+          new DownloadTestItemCreationObserver);
+
       DownloadManagerForBrowser(browser())->DownloadUrl(
-          url, GURL(""), "", false, -1, save_info, web_contents);
+          url, GURL(""), "", false, -1, save_info, web_contents,
+          creation_observer->callback());
+
+      // Wait until the item is created, or we have determined that it
+      // won't be.
+      creation_observer->WaitForDownloadItemCreation();
+
+      int32 invalid_id = content::DownloadId::Invalid().local();
+      EXPECT_EQ(download_info.show_download_item, creation_observer->started());

[Randy Smith (Not in Mondays), 2012/03/07 21:16:57]

Don't use mean ->succeeded() here?  started() will be true if there's a
callback, even if it's in error.

[ahendrickson, 2012/03/08 21:33:07]

Done.

+      if (download_info.show_download_item) {
+        EXPECT_EQ(net::OK, creation_observer->error());
+        EXPECT_NE(invalid_id, creation_observer->download_id().local());
+      } else {
+        EXPECT_NE(net::OK, creation_observer->error());
+        EXPECT_EQ(invalid_id, creation_observer->download_id().local());
+      }
     } else {
       // Navigate to URL normally, wait until done.
       ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
                                                                 url,
                                                                 1);
     }
 
     if (download_info.show_download_item)
       observer->WaitForFinished();
 
@@ skipping 1100 matching lines @@
   ASSERT_TRUE(web_contents);
 
   DownloadTestObserverTerminal* observer(
       new DownloadTestObserverTerminal(
           DownloadManagerForBrowser(browser()), 1,
           false,                   // Ignore select file.
           DownloadTestObserverTerminal::ON_DANGEROUS_DOWNLOAD_FAIL));
   DownloadSaveInfo save_info;
   save_info.prompt_for_save_location = true;
   DownloadManagerForBrowser(browser())->DownloadUrl(
-      url, GURL(""), "", false, -1, save_info, web_contents);
+      url, GURL(""), "", false, -1, save_info, web_contents,
+      DownloadManager::OnStartedCallback());
   observer->WaitForFinished();
   EXPECT_TRUE(observer->select_file_dialog_seen());
 
   // Check state.
   EXPECT_EQ(1, browser()->tab_count());
   ASSERT_TRUE(CheckDownload(browser(), file, file));
   CheckDownloadUI(browser(), true, true, file);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrlToPath) {
   ASSERT_TRUE(InitialSetup(false));
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
 
   WebContents* web_contents = browser()->GetSelectedWebContents();
   ASSERT_TRUE(web_contents);
 
   ScopedTempDir other_directory;
   ASSERT_TRUE(other_directory.CreateUniqueTempDir());
   FilePath target_file_full_path
       = other_directory.path().Append(file.BaseName());
   DownloadSaveInfo save_info;
   save_info.file_path = target_file_full_path;
 
   DownloadTestObserverTerminal* observer(CreateWaiter(browser(), 1));
   DownloadManagerForBrowser(browser())->DownloadUrl(
-      url, GURL(""), "", false, -1, save_info, web_contents);
+      url, GURL(""), "", false, -1, save_info, web_contents,
+      DownloadManager::OnStartedCallback());
   observer->WaitForFinished();
 
   // Check state.
   EXPECT_EQ(1, browser()->tab_count());
   ASSERT_TRUE(CheckDownloadFullPaths(browser(),
                                      target_file_full_path,
                                      OriginFile(file)));
 
   // Temporary downloads won't be visible.
   CheckDownloadUI(browser(), false, false, file);
@@ skipping 203 matching lines @@
     "zip_file_not_found.zip",
     DOWNLOAD_NAVIGATE,
     DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
     false
   };
 
   // Do initial setup.
   ASSERT_TRUE(InitialSetup(false));
   DownloadFileCheckErrors(download_info);
 }