Fixed issue with DownloadTestObserver.

chrome/browser/download/download_extension_test.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 <algorithm>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/download/download_extension_api.h"
@@ skipping 40 matching lines @@
   DownloadManager* GetDownloadManager() {
     DownloadService* download_service =
         DownloadServiceFactory::GetForProfile(browser()->profile());
     return download_service->GetDownloadManager();
   }
 
   void CreateSlowTestDownloads(
       size_t count, DownloadManager::DownloadVector* items) {
     for (size_t i = 0; i < count; ++i) {
       scoped_ptr<DownloadTestObserver> observer(
-          CreateDownloadObserver(1, DownloadItem::IN_PROGRESS));
+          CreateInProgressDownloadObserver(1));
       GURL slow_download_url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
       ui_test_utils::NavigateToURLWithDisposition(
           browser(), slow_download_url, CURRENT_TAB,
           ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
       observer->WaitForFinished();
+      DCHECK_EQ(
+          1u, observer->NumDownloadsSeenInState(DownloadItem::IN_PROGRESS));
       // We don't expect a select file dialog.
       CHECK(!observer->select_file_dialog_seen());
     }
     GetDownloadManager()->GetAllDownloads(FilePath(), items);
     CHECK_EQ(count, items->size());
   }
 
   DownloadItem* CreateSlowTestDownload() {
     scoped_ptr<DownloadTestObserver> observer(
-        CreateDownloadObserver(1, DownloadItem::IN_PROGRESS));
+        CreateInProgressDownloadObserver(1));
     GURL slow_download_url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
     DownloadManager* manager = GetDownloadManager();
 
     EXPECT_EQ(0, manager->InProgressCount());
     if (manager->InProgressCount() != 0)
       return NULL;
 
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), slow_download_url, CURRENT_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
     observer->WaitForFinished();
+    DCHECK_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::IN_PROGRESS));
     // We don't expect a select file dialog.
     if (observer->select_file_dialog_seen())
       return NULL;
 
     DownloadManager::DownloadVector items;
     manager->GetAllDownloads(FilePath(), &items);
 
     DownloadItem* new_item = NULL;
     for (DownloadManager::DownloadVector::iterator iter = items.begin();
          iter != items.end(); ++iter) {
       if ((*iter)->GetState() == DownloadItem::IN_PROGRESS) {
         // There should be only one IN_PROGRESS item.
         EXPECT_EQ(NULL, new_item);
         new_item = *iter;
       }
     }
     return new_item;
   }
 
   void FinishPendingSlowDownloads() {
     scoped_ptr<DownloadTestObserver> observer(
-        CreateDownloadObserver(1, DownloadItem::COMPLETE));
+        CreateDownloadObserver(1));
     GURL finish_url(URLRequestSlowDownloadJob::kFinishDownloadUrl);
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), finish_url, NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
     observer->WaitForFinished();
+    DCHECK_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
   }
 
-  DownloadTestObserver* CreateDownloadObserver(
-      size_t download_count,
-      DownloadItem::DownloadState finished_state) {
-    return new DownloadTestObserver(
-        GetDownloadManager(), download_count, finished_state, true,
+  DownloadTestObserver* CreateDownloadObserver(size_t download_count) {
+    return new DownloadTestObserverTerminal(
+        GetDownloadManager(), download_count, true,
         DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL);
   }
 
+  DownloadTestObserver* CreateInProgressDownloadObserver(
+      size_t download_count) {
+    return new DownloadTestObserverInProgress(GetDownloadManager(),
+                                              download_count);
+  }
+
   bool RunFunction(UIThreadExtensionFunction* function,
                    const std::string& args) {
     // extension_function_test_utils::RunFunction() does not take
     // ownership of |function|.
     scoped_refptr<ExtensionFunction> function_owner(function);
     return extension_function_test_utils::RunFunction(
         function, args, browser(), extension_function_test_utils::NONE);
   }
 
   base::Value* RunFunctionAndReturnResult(UIThreadExtensionFunction* function,
@@ skipping 567 matching lines @@
   ASSERT_TRUE(result.get());
   base::ListValue* result_list = NULL;
   ASSERT_TRUE(result->GetAsList(&result_list));
   ASSERT_EQ(1UL, result_list->GetSize());
   base::DictionaryValue* item_value = NULL;
   ASSERT_TRUE(result_list->GetDictionary(0, &item_value));
   FilePath::StringType item_name;
   ASSERT_TRUE(item_value->GetString("filename", &item_name));
   ASSERT_EQ(items[2]->GetFullPath().value(), item_name);
 }