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

chrome/browser/download/download_test_observer.h

 // 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
 #pragma once
 
 #include <set>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
+#include "net/base/net_errors.h"
 
 // Detects changes to the downloads after construction.
 // Finishes when one of the following happens:
 //   - A specified number of downloads change to either a given state or a
 //     terminal state (defined as either CANCELLED, or one which you can't
 //     switch out of).
 //   - Specific events, such as a select file dialog.
 // Callers may either probe for the finished state, or wait on it.
 //
 // TODO(rdsmith): Detect manager going down, remove pointer to
@@ skipping 168 matching lines @@
 
   void PingIOThread(int cycle);
 
   content::DownloadManager* download_manager_;
   DownloadSet downloads_observed_;
   bool waiting_for_zero_inprogress_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestFlushObserver);
 };
 
+// Waits for a callback indicating that the DownloadItem is about to be created,
+// or that an error occurred and it won't be created.
+class DownloadTestItemCreationObserver
+    : public base::RefCountedThreadSafe<DownloadTestItemCreationObserver> {
+ public:
+  struct CreationInfo {

[Randy Smith (Not in Mondays), 2012/03/06 21:29:14]

Sorry to be pedantic about test code, but good class/header file habits are good
:-} :-J: This structure looks to only be relevant to the implementation, and
looking at the implementation, I'm not clear why you have it at all rather than
having the member variables separately in the class.  If you need it, could you
move it completely into the .cc file (along with the portions of the
implementation here that depend on it :-J)?  If you don't need it, can you get
rid of it?

[ahendrickson, 2012/03/07 02:58:12]

Done.

+    CreationInfo()
+        : download_id(content::DownloadId::Invalid()),
+          error(net::OK) {
+    }
+
+    content::DownloadId download_id;
+    net::Error error;
+  };
+
+  DownloadTestItemCreationObserver();
+
+  void WaitForDownloadItemCreation();
+
+  content::DownloadId download_id() const {
+    return creation_info_.download_id;
+  }
+  net::Error error() const { return creation_info_.error; }
+  bool started() const { return called_back_count_ > 0; }
+  bool succeeded() const {
+    return started() && (creation_info_.error == net::OK);
+  }
+
+  const content::DownloadManager::OnStartedCallback callback();
+
+ private:
+  friend class base::RefCountedThreadSafe<DownloadTestItemCreationObserver>;
+
+  ~DownloadTestItemCreationObserver();
+
+  void DownloadItemCreationCallback(content::DownloadId download_id,
+                                    net::Error error);
+
+  // The download creation information we received.
+  CreationInfo creation_info_;
+
+  // Count of callbacks.
+  size_t called_back_count_;
+
+  // We are in the message loop.
+  bool waiting_;
+
+  DISALLOW_COPY_AND_ASSIGN(DownloadTestItemCreationObserver);
+};
+
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_