Fixed issue with DownloadTestObserver.

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>
 
@@ skipping 55 matching lines @@
   virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE {}
 
   // content::DownloadManager::Observer
   virtual void ModelChanged(content::DownloadManager* manager) OVERRIDE;
 
   virtual void SelectFileDialogDisplayed(
       content::DownloadManager* manager, int32 id) OVERRIDE;
 
   size_t NumDangerousDownloadsSeen() const;
 
+  size_t NumOtherDownloadsSeen() const;
+
  private:
   typedef std::set<content::DownloadItem*> DownloadSet;
 
   // Called when we know that a download item is in a final state.
   // Note that this is not the same as it first transitioning in to the
   // final state; multiple notifications may occur once the item is in
   // that state.  So we keep our own track of transitions into final.
   void DownloadInFinalState(content::DownloadItem* download);
 
+  // Called when we think the download item is in a terminal state.
+  // Should never be called normally, only when there's a problem with a test.

[ahendrickson, 2012/03/01 20:20:14]

Remove 2nd line of comment.  It's incorrect.

[ahendrickson, 2012/03/01 20:38:39]

Done.

+  void DownloadInTerminalState(content::DownloadItem* download);
+
   void SignalIfFinished();
 
   // The observed download manager.
   scoped_refptr<content::DownloadManager> download_manager_;
 
+  // The set of |DownloadItem|s that have transitioned to a final state before
+  // we start.  May overlap with |finished_downloads_|.

[ahendrickson, 2012/03/01 20:20:14]

May -> Will not

[ahendrickson, 2012/03/01 20:38:39]

Done.

+  DownloadSet previously_finished_downloads_;

[benjhayden, 2012/03/01 19:58:32]

So now we have 4 DownloadSets.
It seems that it would be a simpler if we had a single map/set of DownloadItems,
and filtered that single data-structure in different ways.
Is there any way to compute these sets when they're needed?

[ahendrickson, 2012/03/01 20:38:39]

I think the code would be more cluttered.  Yes, we could put them all in one
DownloadSet that contained a structure (including a DownloadItem, but we would
need a flag that indicated whether or not it was marked after the test object's
constructor finished).  Then each test of inclusion would need to search the
DownloadSet by looping through it.

If you can think of a simpler way, I'd be interested in hearing about it.

+
+  // The set of |DownloadItem|s that have transitioned to a final state without
+  // having hit the 'finished' state.  Will not overlap with
+  // |finished_downloads_|.
+  // This is so the test will finish even if it doesn't have the expected
+  // result.
+  DownloadSet finished_other_downloads_;
+
   // The set of DownloadItem's that have transitioned to their finished state
   // since construction of this object.  When the size of this array
   // reaches wait_count_, we're done.
   DownloadSet finished_downloads_;
 
   // The set of DownloadItem's we are currently observing.  Generally there
   // won't be any overlap with the above; once we see the final state
   // on a DownloadItem, we'll stop observing it.
   DownloadSet downloads_observed_;
 
@@ skipping 75 matching lines @@
   void PingIOThread(int cycle);
 
   content::DownloadManager* download_manager_;
   DownloadSet downloads_observed_;
   bool waiting_for_zero_inprogress_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestFlushObserver);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_