Rearrange Should*Download delegate calls to be more useful and intuitive.

content/browser/download/download_manager.cc

 // Copyright (c) 2011 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/browser/download/download_manager.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 477 matching lines @@
 
   // Confirm we're in the proper set of states to be here;
   // in in_progress_, have all data, have a history handle, (validated or safe).
   DCHECK_NE(DownloadItem::DANGEROUS, download->safety_state());
   DCHECK_EQ(1u, in_progress_.count(download->id()));
   DCHECK(download->all_data_saved());
   DCHECK(download->db_handle() != DownloadItem::kUninitializedHandle);
   DCHECK_EQ(1u, history_downloads_.count(download->db_handle()));
 
   VLOG(20) << __FUNCTION__ << "()" << " executing: download = "
            << download->DebugString(false);

[asanka, 2011/10/28 19:22:19]

Very minor nit: Should this logging happen after calling
ShouldCompleteDownload()?

[Randy Smith (Not in Mondays), 2011/10/29 23:10:39]

Yeah, I think so.  Done.

 
+  // Give the delegate a chance to override.
+  if (!delegate_->ShouldCompleteDownload(download))
+    return;
+
   // Remove the id from in_progress
   in_progress_.erase(download->id());
   UpdateDownloadProgress();  // Reflect removal from in_progress_.
 
   delegate_->UpdateItemInPersistentStore(download);
 
   // Finish the download.
   download->OnDownloadCompleting(file_manager_);
 }
 
@@ skipping 573 matching lines @@
 void DownloadManager::MarkDownloadOpened(DownloadItem* download) {
   delegate_->UpdateItemInPersistentStore(download);
   int num_unopened = 0;
   for (DownloadMap::iterator it = history_downloads_.begin();
        it != history_downloads_.end(); ++it) {
     if (it->second->IsComplete() && !it->second->opened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }