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

chrome/browser/download/download_test_observer.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 <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 300 matching lines @@
 void DownloadTestFlushObserver::PingIOThread(int cycle) {
   if (--cycle) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&DownloadTestFlushObserver::PingFileThread, this, cycle));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure());
   }
 }
+
+DownloadTestItemCreationObserver::~DownloadTestItemCreationObserver() {

[cbentzel, 2012/03/08 17:58:48]

Nit: comes after the constructor.

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

Done.

+}
+
+DownloadTestItemCreationObserver::DownloadTestItemCreationObserver()
+    : download_id_(content::DownloadId::Invalid()),
+      error_(net::OK),
+      called_back_count_(0),
+      waiting_(false) {
+}
+
+void DownloadTestItemCreationObserver::WaitForDownloadItemCreation() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  if (called_back_count_ == 0) {
+    waiting_ = true;
+    ui_test_utils::RunMessageLoop();
+    waiting_ = false;
+  }
+}
+
+void DownloadTestItemCreationObserver::DownloadItemCreationCallback(
+    content::DownloadId download_id, net::Error error) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  download_id_ = download_id;
+  error_ = error;
+  ++called_back_count_;
+
+  if (waiting_ && (called_back_count_ > 0))

[cbentzel, 2012/03/08 17:58:48]

called_back_count_ will always be > 0. Do you need this?

I think you could also remove the waiting_ variable and just check is_running on
the message loop. This is fine though.

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

Ah, this is kind of left over from when I was waiting for multiple downloads.

Removed called_back_count_ from test.

+    MessageLoopForUI::current()->Quit();
+}
+
+const content::DownloadManager::OnStartedCallback
+    DownloadTestItemCreationObserver::callback() {
+  return base::Bind(
+      &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
+}
+