Fixed issue with DownloadTestObserver.

chrome/browser/ui/browser_close_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/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
@@ skipping 97 matching lines @@
     GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
 
     if (num_downloads == 0)
       return;
 
     // Setup an observer waiting for the given number of downloads
     // to get to IN_PROGRESS.
     DownloadManager* download_manager =
         browser->profile()->GetDownloadManager();
     scoped_ptr<DownloadTestObserver> observer(
-        new DownloadTestObserver(
-            download_manager, num_downloads,
-            DownloadItem::IN_PROGRESS,
-            true,  // Bail on select file.
-            DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
+        new DownloadTestObserverInProgress(download_manager,
+                                           num_downloads,
+                                           true));  // Bail on select file.
 
     // Set of that number of downloads.
+    size_t count_downloads = num_downloads;
     while (num_downloads--)
       ui_test_utils::NavigateToURLWithDisposition(
           browser, url, NEW_BACKGROUND_TAB,
           ui_test_utils::BROWSER_TEST_NONE);
 
     // Wait for them.
     observer->WaitForFinished();
+    DCHECK_EQ(count_downloads,

[sky, 2012/03/09 20:20:28]

Why are you using DCHECK in a test?

[ahendrickson, 2012/03/09 20:49:14]

Oops, missed that one.  Fixed.

+              observer->NumDownloadsSeenInState(DownloadItem::IN_PROGRESS));
   }
 
   // All all downloads created in CreateStalledDownloads() to
   // complete, and block in this routine until they do complete.
   void CompleteAllDownloads(Browser* browser) {
     GURL finish_url(URLRequestSlowDownloadJob::kFinishDownloadUrl);
     ui_test_utils::NavigateToURL(browser, finish_url);
 
     // Go through and, for every single profile, wait until there are
     // no active downloads on that download manager.
@@ skipping 412 matching lines @@
 #define MAYBE_DownloadsCloseCheck_5 DownloadsCloseCheck_5
 #endif
 
 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) {
   ASSERT_TRUE(SetupForDownloadCloseCheck());
   for (size_t i = 5 * arraysize(download_close_check_cases) / 6;
        i < 6 * arraysize(download_close_check_cases) / 6; ++i) {
     ExecuteDownloadCloseCheckCase(i);
   }
 }