Make web store resilient against download completion happening before opening.

content/public/test/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 "content/public/test/download_test_observer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 26 matching lines @@
 void DenyDangerousDownload(scoped_refptr<DownloadManager> download_manager,
                            int32 download_id) {
   DownloadItem* download = download_manager->GetDownloadItem(download_id);
   ASSERT_TRUE(download->IsPartialDownload());
   download->Cancel(true);
   download->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }
 
 }  // namespace
 
+DownloadUpdatedObserver::DownloadUpdatedObserver(
+    DownloadItem* item, DownloadUpdatedObserver::EventFilter filter)
+    : item_(item), filter_(filter), waiting_(false) {
+  item->AddObserver(this);
+}
+
+DownloadUpdatedObserver::~DownloadUpdatedObserver() {
+  if (item_)
+    item_->RemoveObserver(this);
+}
+
+bool DownloadUpdatedObserver::WaitForEvent() {
+  if (item_ && filter_.Run(item_))
+    return true;
+
+  waiting_ = true;
+  RunMessageLoop();
+  waiting_ = false;
+
+  if (!item_)
+    return false;
+
+  return true;

[benjhayden, 2012/09/10 14:48:52]

Are you sure that OnDownloadDestroyed() will never run between
OnDownloadUpdated() and MessageLoop::Quit()? Couldn't hurt to double-check
filter_.Run(item_) here, could it?

[Randy Smith (Not in Mondays), 2012/09/10 17:16:42]

I'm not quite sure the race you're protecting against, but OnDownloadDestroyed()
happening after OnDownloadUpdated() and before the return from the message loop
would result in a false negative, so I rewrite the class to protect against
that.  Let me know what you think.

+}
+
+void DownloadUpdatedObserver::OnDownloadUpdated(DownloadItem* item) {
+  DCHECK_EQ(item_, item);
+  if (waiting_ && filter_.Run(item_))
+    MessageLoopForUI::current()->Quit();
+}
+
+void DownloadUpdatedObserver::OnDownloadDestroyed(DownloadItem* item) {
+  DCHECK_EQ(item_, item);
+  item_->RemoveObserver(this);
+  item_ = NULL;
+  if (waiting_)
+    MessageLoopForUI::current()->Quit();
+}
+
 DownloadTestObserver::DownloadTestObserver(
     DownloadManager* download_manager,
     size_t wait_count,
     DangerousDownloadAction dangerous_download_action)
     : download_manager_(download_manager),
       wait_count_(wait_count),
       finished_downloads_at_construction_(0),
       waiting_(false),
       dangerous_download_action_(dangerous_download_action) {
 }
@@ skipping 319 matching lines @@
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content