Make DownloadHistory observe manager, items

content/browser/download/download_item_impl.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/browser/download/download_item_impl.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 69 matching lines @@
 }
 
 const char* DebugDownloadStateString(DownloadItem::DownloadState state) {
   switch (state) {
     case DownloadItem::IN_PROGRESS:
       return "IN_PROGRESS";
     case DownloadItem::COMPLETE:
       return "COMPLETE";
     case DownloadItem::CANCELLED:
       return "CANCELLED";
-    case DownloadItem::REMOVING:
-      return "REMOVING";
     case DownloadItem::INTERRUPTED:
       return "INTERRUPTED";
     default:
       NOTREACHED() << "Unknown download state " << state;
       return "unknown";
   };
 }
 
 // Classes to null out request handle calls (for SavePage DownloadItems, which
 // may have, e.g., Cancel() called on them without it doing anything)
@@ skipping 54 matching lines @@
       has_user_gesture_(false),
       total_bytes_(info.total_bytes),
       received_bytes_(info.received_bytes),
       bytes_per_sec_(0),
       last_reason_(content::DOWNLOAD_INTERRUPT_REASON_NONE),
       start_tick_(base::TimeTicks()),
       state_(static_cast<DownloadState>(info.state)),
       danger_type_(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS),
       start_time_(info.start_time),
       end_time_(info.end_time),
-      db_handle_(info.db_handle),
       delegate_(delegate),
       is_paused_(false),
       open_when_complete_(false),
       file_externally_removed_(false),
       safety_state_(SAFE),
       auto_opened_(false),
-      is_persisted_(true),
       is_otr_(false),
       is_temporary_(false),
       all_data_saved_(false),
       opened_(info.opened),
       open_enabled_(true),
       delegate_delayed_complete_(false),
       bound_net_log_(bound_net_log),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   delegate_->Attach();
   if (IsInProgress())
@@ skipping 28 matching lines @@
       referrer_charset_(info.referrer_charset),
       remote_address_(info.remote_address),
       total_bytes_(info.total_bytes),
       received_bytes_(0),
       bytes_per_sec_(0),
       last_reason_(content::DOWNLOAD_INTERRUPT_REASON_NONE),
       start_tick_(base::TimeTicks::Now()),
       state_(IN_PROGRESS),
       danger_type_(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS),
       start_time_(info.start_time),
-      db_handle_(DownloadItem::kUninitializedHandle),
       delegate_(delegate),
       is_paused_(false),
       open_when_complete_(false),
       file_externally_removed_(false),
       safety_state_(SAFE),
       auto_opened_(false),
-      is_persisted_(false),
       is_otr_(is_otr),
       is_temporary_(!info.save_info.file_path.empty()),
       all_data_saved_(false),
       opened_(false),
       open_enabled_(true),
       delegate_delayed_complete_(false),
       bound_net_log_(bound_net_log),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   delegate_->Attach();
   Init(true /* actively downloading */,
@@ skipping 29 matching lines @@
       mime_type_(mime_type),
       original_mime_type_(mime_type),
       total_bytes_(0),
       received_bytes_(0),
       bytes_per_sec_(0),
       last_reason_(content::DOWNLOAD_INTERRUPT_REASON_NONE),
       start_tick_(base::TimeTicks::Now()),
       state_(IN_PROGRESS),
       danger_type_(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS),
       start_time_(base::Time::Now()),
-      db_handle_(DownloadItem::kUninitializedHandle),
       delegate_(delegate),
       is_paused_(false),
       open_when_complete_(false),
       file_externally_removed_(false),
       safety_state_(SAFE),
       auto_opened_(false),
-      is_persisted_(false),
       is_otr_(is_otr),
       is_temporary_(false),
       all_data_saved_(false),
       opened_(false),
       open_enabled_(true),
       delegate_delayed_complete_(false),
       bound_net_log_(bound_net_log),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   delegate_->Attach();
   Init(true /* actively downloading */,
        download_net_logs::SRC_SAVE_PAGE_AS);
 }
 
 DownloadItemImpl::~DownloadItemImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  TransitionTo(REMOVING);
-  STLDeleteContainerPairSecondPointers(
-      external_data_map_.begin(), external_data_map_.end());
+  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadDestroyed(this));
   delegate_->AssertStateConsistent(this);
   delegate_->Detach();
 }
 
 void DownloadItemImpl::AddObserver(Observer* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   observers_.AddObserver(observer);
 }
 
@@ skipping 331 matching lines @@
   // We have now been deleted.
 }
 
 void DownloadItemImpl::Remove() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   delegate_->AssertStateConsistent(this);
   Cancel(true);
   delegate_->AssertStateConsistent(this);
 
-  TransitionTo(REMOVING);
+  NotifyRemoved();
   delegate_->DownloadRemoved(this);
   // We have now been deleted.
 }
 
+void DownloadItemImpl::NotifyRemoved() {
+  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadRemoved(this));
+}
+
 bool DownloadItemImpl::TimeRemaining(base::TimeDelta* remaining) const {
   if (total_bytes_ <= 0)
     return false;  // We never received the content_length for this download.
 
   int64 speed = CurrentSpeed();
   if (speed == 0)
     return false;
 
   *remaining = base::TimeDelta::FromSeconds(
       (total_bytes_ - received_bytes_) / speed);
@@ skipping 148 matching lines @@
   return (danger_type_ == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE ||
           danger_type_ == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
           danger_type_ == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT ||
           danger_type_ == content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT);
 #else
   return (danger_type_ == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE ||
           danger_type_ == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL);
 #endif
 }
 
-DownloadPersistentStoreInfo DownloadItemImpl::GetPersistentStoreInfo() const {
-  // TODO(asanka): Persist GetTargetFilePath() as well.
-  return DownloadPersistentStoreInfo(GetFullPath(),
-                                     GetURL(),
-                                     GetReferrerUrl(),
-                                     GetStartTime(),
-                                     GetEndTime(),
-                                     GetReceivedBytes(),
-                                     GetTotalBytes(),
-                                     GetState(),
-                                     GetDbHandle(),
-                                     GetOpened());
-}
-
 WebContents* DownloadItemImpl::GetWebContents() const {
   // TODO(rdsmith): Remove null check after removing GetWebContents() from
   // paths that might be used by DownloadItems created from history import.
   // Currently such items have null request_handle_s, where other items
   // (regular and SavePackage downloads) have actual objects off the pointer.
   if (request_handle_.get())
     return request_handle_->GetWebContents();
   return NULL;
 }
 
@@ skipping 111 matching lines @@
 
   bound_net_log_.BeginEvent(
       net::NetLog::TYPE_DOWNLOAD_ITEM_ACTIVE,
       base::Bind(&download_net_logs::ItemActivatedCallback,
                  this, download_type, &file_name));
 
   // If this is not an active download, end the ACTIVE event now.
   if (!active) {
     bound_net_log_.AddEvent(
         net::NetLog::TYPE_DOWNLOAD_ITEM_IN_HISTORY,
-        net::NetLog::Int64Callback("db_handle", db_handle_));
+        net::NetLog::Int64Callback("id", GetId()));
 
     bound_net_log_.EndEvent(net::NetLog::TYPE_DOWNLOAD_ITEM_ACTIVE);
   }
 
   VLOG(20) << __FUNCTION__ << "() " << DebugString(true);
 }
 
 bool DownloadItemImpl::NeedsRename() const {
   DCHECK(target_path_.DirName() == current_path_.DirName());
   return target_path_ != current_path_;
@@ skipping 43 matching lines @@
     ++iter;
     for ( ; verbose && (iter != last); ++iter) {
       url_list += " ->\n\t";
       const GURL& next_url = *iter;
       url_list += next_url.spec();
     }
   }
 
   if (verbose) {
     description += base::StringPrintf(
-        " db_handle = %" PRId64
         " total = %" PRId64
         " received = %" PRId64
         " reason = %s"
         " paused = %c"
         " otr = %c"
         " safety = %s"
         " last_modified = '%s'"
         " etag = '%s'"
         " url_chain = \n\t\"%s\"\n\t"
         " full_path = \"%" PRFilePath "\""
         " target_path = \"%" PRFilePath "\"",
-        GetDbHandle(),
         GetTotalBytes(),
         GetReceivedBytes(),
         InterruptReasonDebugString(last_reason_).c_str(),
         IsPaused() ? 'T' : 'F',
         IsOtr() ? 'T' : 'F',
         DebugSafetyStateString(GetSafetyState()),
         GetLastModifiedTime().c_str(),
         GetETag().c_str(),
         url_list.c_str(),
         GetFullPath().value().c_str(),
         GetTargetFilePath().value().c_str());
   } else {
     description += base::StringPrintf(" url = \"%s\"", url_list.c_str());
   }
 
   description += " }";
 
   return description;
 }
 
 bool DownloadItemImpl::AllDataSaved() const { return all_data_saved_; }
+
 DownloadItem::DownloadState DownloadItemImpl::GetState() const {
   return state_;
 }
+
 const std::vector<GURL>& DownloadItemImpl::GetUrlChain() const {
   return url_chain_;
 }
+
 const GURL& DownloadItemImpl::GetOriginalUrl() const {
   return url_chain_.front();
 }
+
 const GURL& DownloadItemImpl::GetReferrerUrl() const { return referrer_url_; }
+
 std::string DownloadItemImpl::GetSuggestedFilename() const {
   return suggested_filename_;
 }
+
 std::string DownloadItemImpl::GetContentDisposition() const {
   return content_disposition_;
 }
+
 std::string DownloadItemImpl::GetMimeType() const { return mime_type_; }
+
 std::string DownloadItemImpl::GetOriginalMimeType() const {
   return original_mime_type_;
 }
+
 std::string DownloadItemImpl::GetReferrerCharset() const {
   return referrer_charset_;
 }
+
 std::string DownloadItemImpl::GetRemoteAddress() const {
   return remote_address_;
 }
+
 int64 DownloadItemImpl::GetTotalBytes() const { return total_bytes_; }
+
 void DownloadItemImpl::SetTotalBytes(int64 total_bytes) {
   total_bytes_ = total_bytes;
 }
+
 const std::string& DownloadItemImpl::GetHash() const { return hash_; }
+
 int64 DownloadItemImpl::GetReceivedBytes() const { return received_bytes_; }
+
 const std::string& DownloadItemImpl::GetHashState() const {
   return hash_state_;
 }
+
 int32 DownloadItemImpl::GetId() const { return download_id_.local(); }
+
 DownloadId DownloadItemImpl::GetGlobalId() const { return download_id_; }
+
 base::Time DownloadItemImpl::GetStartTime() const { return start_time_; }
+
 base::Time DownloadItemImpl::GetEndTime() const { return end_time_; }
 
-void DownloadItemImpl::SetIsPersisted() {
-  is_persisted_ = true;
-}
+bool DownloadItemImpl::IsPaused() const { return is_paused_; }
 
-bool DownloadItemImpl::IsPersisted() const {
-  return is_persisted_;
-}
-
-void DownloadItemImpl::SetDbHandle(int64 handle) {
-  db_handle_ = handle;
-
-  bound_net_log_.AddEvent(
-      net::NetLog::TYPE_DOWNLOAD_ITEM_IN_HISTORY,
-      net::NetLog::Int64Callback("db_handle", db_handle_));
-}
-
-int64 DownloadItemImpl::GetDbHandle() const { return db_handle_; }
-bool DownloadItemImpl::IsPaused() const { return is_paused_; }
 bool DownloadItemImpl::GetOpenWhenComplete() const {
   return open_when_complete_;
 }
+
 void DownloadItemImpl::SetOpenWhenComplete(bool open) {
   open_when_complete_ = open;
 }
+
 bool DownloadItemImpl::GetFileExternallyRemoved() const {
   return file_externally_removed_;
 }
+
 DownloadItem::SafetyState DownloadItemImpl::GetSafetyState() const {
   return safety_state_;
 }
+
 bool DownloadItemImpl::IsOtr() const { return is_otr_; }
+
 bool DownloadItemImpl::GetAutoOpened() { return auto_opened_; }
+
 FilePath DownloadItemImpl::GetTargetName() const {
   return target_path_.BaseName();
 }
+
 const FilePath& DownloadItemImpl::GetForcedFilePath() const {
   // TODO(asanka): Get rid of GetForcedFilePath(). We should instead just
   // require that clients respect GetTargetFilePath() if it is already set.
   return forced_file_path_;
 }
+
 bool DownloadItemImpl::HasUserGesture() const {
   return has_user_gesture_;
 };
+
 content::PageTransition DownloadItemImpl::GetTransitionType() const {
   return transition_type_;
 };
+
 bool DownloadItemImpl::IsTemporary() const { return is_temporary_; }
+
 void DownloadItemImpl::SetIsTemporary(bool temporary) {
   is_temporary_ = temporary;
 }
+
 void DownloadItemImpl::SetOpened(bool opened) { opened_ = opened; }
+
 bool DownloadItemImpl::GetOpened() const { return opened_; }
+
 const std::string& DownloadItemImpl::GetLastModifiedTime() const {
   return last_modified_time_;
 }
+
 const std::string& DownloadItemImpl::GetETag() const { return etag_; }
+
 content::DownloadInterruptReason DownloadItemImpl::GetLastReason() const {
   return last_reason_;
 }
+
 void DownloadItemImpl::MockDownloadOpenForTesting() { open_enabled_ = false; }
-
-DownloadItem::ExternalData*
-DownloadItemImpl::GetExternalData(const void* key) {
-  // The behavior of the const overload is identical with the exception of the
-  // constness of |this| and the return value.
-  return const_cast<DownloadItem::ExternalData*>(
-      static_cast<const DownloadItemImpl&>(*this).GetExternalData(key));
-}
-
-const DownloadItem::ExternalData*
-DownloadItemImpl::GetExternalData(const void* key) const {
-  std::map<const void*, ExternalData*>::const_iterator it =
-      external_data_map_.find(key);
-  return (it == external_data_map_.end()) ? NULL : it->second;
-}
-
-void DownloadItemImpl::SetExternalData(
-    const void* key, DownloadItem::ExternalData* data) {
-  std::map<const void*, ExternalData*>::iterator it =
-      external_data_map_.find(key);
-
-  if (it == external_data_map_.end()) {
-    external_data_map_[key] = data;
-  } else if (it->second != data) {
-    delete it->second;
-    it->second = data;
-  }
-}