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

content/browser/download/download_item.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_item.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/basictypes.h"
@@ skipping 278 matching lines @@
   download_stats::RecordOpen(end_time(), !opened());
   opened_ = true;
   FOR_EACH_OBSERVER(Observer, observers_, OnDownloadOpened(this));
   download_manager_->MarkDownloadOpened(this);
 
   // For testing: If download opening is disabled on this item,
   // make the rest of the routine a no-op.
   if (!open_enabled_)
     return;
 
-  if (download_manager_->delegate()->ShouldOpenDownload(this))
-    content::GetContentClient()->browser()->OpenItem(full_path());
+  content::GetContentClient()->browser()->OpenItem(full_path());
 }
 
 void DownloadItem::ShowDownloadInShell() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   content::GetContentClient()->browser()->ShowItemInFolder(full_path());
 }
 
 void DownloadItem::DangerousDownloadValidated() {
@@ skipping 79 matching lines @@
 
 void DownloadItem::MarkAsComplete() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DCHECK(all_data_saved_);
   end_time_ = base::Time::Now();
   TransitionTo(COMPLETE);
 }
 
-void DownloadItem::CompleteDelayedDownload() {
+void DownloadItem::DelayedDownloadOpened() {
   auto_opened_ = true;
   Completed();
 }
 
 void DownloadItem::OnAllDataSaved(int64 size) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DCHECK(!all_data_saved_);
   all_data_saved_ = true;
@@ skipping 201 matching lines @@
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(20) << __FUNCTION__ << "()"
            << " full_path = \"" << full_path.value() << "\""
            << " needed rename = " << NeedsRename()
            << " " << DebugString(false);
   DCHECK(NeedsRename());
 
   Rename(full_path);
 
-  if (download_manager_->delegate()->ShouldCompleteDownload(this)) {
+  if (download_manager_->delegate()->ShouldOpenDownload(this)) {
     Completed();
   } else {
     delegate_delayed_complete_ = true;
   }
 }
 
 bool DownloadItem::MatchesQuery(const string16& query) const {
   if (query.empty())
     return true;
 
@@ skipping 178 matching lines @@
         state_info_.target_name.value().c_str(),
         full_path().value().c_str());
   } else {
     description += base::StringPrintf(" url = \"%s\"", url_list.c_str());
   }
 
   description += " }";
 
   return description;
 }