Split DownloadItem into an ABC, an Impl, and a Mock.

content/browser/download/download_item_impl.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 "content/browser/download/download_item_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/logging.h"
@@ skipping 68 matching lines @@
     case DownloadItem::REMOVING:
       return "REMOVING";
     case DownloadItem::INTERRUPTED:
       return "INTERRUPTED";
     default:
       NOTREACHED() << "Unknown download state " << state;
       return "unknown";
   };
 }
 
-DownloadItem::SafetyState GetSafetyState(bool dangerous_file,
+DownloadItem::SafetyState SelectSafetyState(bool dangerous_file,
                                          bool dangerous_url) {
   return (dangerous_url || dangerous_file) ?
       DownloadItem::DANGEROUS : DownloadItem::SAFE;
 }
 
 // Note: When a download has both |dangerous_file| and |dangerous_url| set,
 // danger type is set to DANGEROUS_URL since the risk of dangerous URL
 // overweights that of dangerous file type.
 DownloadItem::DangerType GetDangerType(bool dangerous_file,
                                        bool dangerous_url) {
   if (dangerous_url) {
     // dangerous URL overweights dangerous file. We check dangerous URL first.
     return DownloadItem::DANGEROUS_URL;
   }
   return dangerous_file ?
       DownloadItem::DANGEROUS_FILE : DownloadItem::NOT_DANGEROUS;
 }
 
 }  // namespace
 
 // Our download table ID starts at 1, so we use 0 to represent a download that
 // has started, but has not yet had its data persisted in the table. We use fake
 // database handles in incognito mode starting at -1 and progressively getting
 // more negative.
-// static
-const int DownloadItem::kUninitializedHandle = 0;
-
-const char DownloadItem::kEmptyFileHash[] = "";
 
 // Constructor for reading from the history service.
-DownloadItem::DownloadItem(DownloadManager* download_manager,
+DownloadItemImpl::DownloadItemImpl(DownloadManager* download_manager,
                            const DownloadPersistentStoreInfo& info)
     : download_id_(download_manager->GetNextId()),
       full_path_(info.path),
       url_chain_(1, info.url),
       referrer_url_(info.referrer_url),
       total_bytes_(info.total_bytes),
       received_bytes_(info.received_bytes),
       start_tick_(base::TimeTicks()),
       state_(static_cast<DownloadState>(info.state)),
       start_time_(info.start_time),
@@ skipping 12 matching lines @@
       open_enabled_(true),
       delegate_delayed_complete_(false) {
   if (IsInProgress())
     state_ = CANCELLED;
   if (IsComplete())
     all_data_saved_ = true;
   Init(false /* not actively downloading */);
 }
 
 // Constructing for a regular download:
-DownloadItem::DownloadItem(DownloadManager* download_manager,
+DownloadItemImpl::DownloadItemImpl(DownloadManager* download_manager,
                            const DownloadCreateInfo& info,
                            DownloadRequestHandleInterface* request_handle,
                            bool is_otr)
     : state_info_(info.original_name, info.save_info.file_path,
                   info.has_user_gesture, info.transition_type,
                   info.prompt_user_for_save_location, info.path_uniquifier,
                   false, false),
       request_handle_(request_handle),
       download_id_(info.download_id),
       full_path_(info.path),
@@ skipping 20 matching lines @@
       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) {
   Init(true /* actively downloading */);
 }
 
 // Constructing for the "Save Page As..." feature:
-DownloadItem::DownloadItem(DownloadManager* download_manager,
+DownloadItemImpl::DownloadItemImpl(DownloadManager* download_manager,
                            const FilePath& path,
                            const GURL& url,
                            bool is_otr,
                            DownloadId download_id)
     : download_id_(download_id),
       full_path_(path),
       url_chain_(1, url),
       referrer_url_(GURL()),
       total_bytes_(0),
       received_bytes_(0),
@@ skipping 10 matching lines @@
       auto_opened_(false),
       is_otr_(is_otr),
       is_temporary_(false),
       all_data_saved_(false),
       opened_(false),
       open_enabled_(true),
       delegate_delayed_complete_(false) {
   Init(true /* actively downloading */);
 }
 
-DownloadItem::~DownloadItem() {
+DownloadItemImpl::~DownloadItemImpl() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   TransitionTo(REMOVING);
   download_manager_->AssertQueueStateConsistent(this);
 }
 
-void DownloadItem::AddObserver(Observer* observer) {
+void DownloadItemImpl::AddObserver(Observer* observer) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   observers_.AddObserver(observer);
 }
 
-void DownloadItem::RemoveObserver(Observer* observer) {
+void DownloadItemImpl::RemoveObserver(Observer* observer) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   observers_.RemoveObserver(observer);
 }
 
-void DownloadItem::UpdateObservers() {
+void DownloadItemImpl::UpdateObservers() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   FOR_EACH_OBSERVER(Observer, observers_, OnDownloadUpdated(this));
 }
 
-bool DownloadItem::CanShowInFolder() {
+bool DownloadItemImpl::CanShowInFolder() {
   return !IsCancelled() && !file_externally_removed_;
 }
 
-bool DownloadItem::CanOpenDownload() {
+bool DownloadItemImpl::CanOpenDownload() {
   return !file_externally_removed_;
 }
 
-bool DownloadItem::ShouldOpenFileBasedOnExtension() {
+bool DownloadItemImpl::ShouldOpenFileBasedOnExtension() {
   return download_manager_->delegate()->ShouldOpenFileBasedOnExtension(
       GetUserVerifiedFilePath());
 }
 
-void DownloadItem::OpenDownload() {
+void DownloadItemImpl::OpenDownload() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (IsPartialDownload()) {
     open_when_complete_ = !open_when_complete_;
     return;
   }
 
   if (!IsComplete() || file_externally_removed_)
     return;
 
   // Ideally, we want to detect errors in opening and report them, but we
   // don't generally have the proper interface for that to the external
   // program that opens the file.  So instead we spawn a check to update
   // the UI if the file has been deleted in parallel with the open.
   download_manager_->CheckForFileRemoval(this);
-  download_stats::RecordOpen(end_time(), !opened());
+  download_stats::RecordOpen(GetEndTime(), !GetOpened());
   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;
 
-  content::GetContentClient()->browser()->OpenItem(full_path());
+  content::GetContentClient()->browser()->OpenItem(GetFullPath());
 }
 
-void DownloadItem::ShowDownloadInShell() {
+void DownloadItemImpl::ShowDownloadInShell() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  content::GetContentClient()->browser()->ShowItemInFolder(full_path());
+  content::GetContentClient()->browser()->ShowItemInFolder(GetFullPath());
 }
 
-void DownloadItem::DangerousDownloadValidated() {
+void DownloadItemImpl::DangerousDownloadValidated() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK_EQ(DANGEROUS, safety_state());
+  DCHECK_EQ(DANGEROUS, GetSafetyState());
 
   UMA_HISTOGRAM_ENUMERATION("Download.DangerousDownloadValidated",
                             GetDangerType(),
                             DANGEROUS_TYPE_MAX);
 
   safety_state_ = DANGEROUS_BUT_VALIDATED;
   UpdateObservers();
 
   download_manager_->MaybeCompleteDownload(this);
 }
 
-void DownloadItem::UpdateSize(int64 bytes_so_far) {
+void DownloadItemImpl::UpdateSize(int64 bytes_so_far) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   received_bytes_ = bytes_so_far;
 
   // If we've received more data than we were expecting (bad server info?),
   // revert to 'unknown size mode'.
   if (received_bytes_ > total_bytes_)
     total_bytes_ = 0;
 }
 
 // Updates from the download thread may have been posted while this download
 // was being cancelled in the UI thread, so we'll accept them unless we're
 // complete.
-void DownloadItem::Update(int64 bytes_so_far) {
+void DownloadItemImpl::Update(int64 bytes_so_far) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!IsInProgress()) {
     NOTREACHED();
     return;
   }
   UpdateSize(bytes_so_far);
   UpdateObservers();
 }
 
 // Triggered by a user action.
-void DownloadItem::Cancel(bool user_cancel) {
+void DownloadItemImpl::Cancel(bool user_cancel) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   last_reason_ = user_cancel ?
       DOWNLOAD_INTERRUPT_REASON_USER_CANCELED :
       DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN;
 
   VLOG(20) << __FUNCTION__ << "() download = " << DebugString(true);
   if (!IsPartialDownload()) {
     // Small downloads might be complete before this method has
     // a chance to run.
     return;
   }
 
   download_stats::RecordDownloadCount(download_stats::CANCELLED_COUNT);
 
   TransitionTo(CANCELLED);
   if (user_cancel)
     download_manager_->DownloadCancelledInternal(this);
 }
 
-void DownloadItem::MarkAsComplete() {
+void DownloadItemImpl::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::DelayedDownloadOpened() {
+void DownloadItemImpl::DelayedDownloadOpened() {
   auto_opened_ = true;
   Completed();
 }
 
-void DownloadItem::OnAllDataSaved(int64 size, const std::string& final_hash) {
+void DownloadItemImpl::OnAllDataSaved(
+    int64 size, const std::string& final_hash) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DCHECK(!all_data_saved_);
   all_data_saved_ = true;
   UpdateSize(size);
   hash_ = final_hash;
 }
 
-void DownloadItem::OnDownloadedFileRemoved() {
+void DownloadItemImpl::OnDownloadedFileRemoved() {
   file_externally_removed_ = true;
   UpdateObservers();
 }
 
-void DownloadItem::Completed() {
+void DownloadItemImpl::Completed() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(20) << __FUNCTION__ << "() " << DebugString(false);
 
   DCHECK(all_data_saved_);
   end_time_ = base::Time::Now();
   TransitionTo(COMPLETE);
-  download_manager_->DownloadCompleted(id());
+  download_manager_->DownloadCompleted(GetId());
   download_stats::RecordDownloadCompleted(start_tick_, received_bytes_);
 
   if (auto_opened_) {
     // If it was already handled by the delegate, do nothing.
-  } else if (open_when_complete() ||
+  } else if (GetOpenWhenComplete() ||
              ShouldOpenFileBasedOnExtension() ||
-             is_temporary()) {
+             IsTemporary()) {
     // If the download is temporary, like in drag-and-drop, do not open it but
     // we still need to set it auto-opened so that it can be removed from the
     // download shelf.
-    if (!is_temporary())
+    if (!IsTemporary())
       OpenDownload();
 
     auto_opened_ = true;
     UpdateObservers();
   }
 }
 
-void DownloadItem::TransitionTo(DownloadState new_state) {
+void DownloadItemImpl::TransitionTo(DownloadState new_state) {
   if (state_ == new_state)
     return;
 
   state_ = new_state;
   UpdateObservers();
 }
 
-void DownloadItem::UpdateSafetyState() {
+void DownloadItemImpl::UpdateSafetyState() {
   SafetyState updated_value(
-      GetSafetyState(state_info_.is_dangerous_file,
+      SelectSafetyState(state_info_.is_dangerous_file,
                      state_info_.is_dangerous_url));
   if (updated_value != safety_state_) {
     safety_state_ = updated_value;
     UpdateObservers();
   }
 }
 
-void DownloadItem::UpdateTarget() {
+void DownloadItemImpl::UpdateTarget() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (state_info_.target_name.value().empty())
     state_info_.target_name = full_path_.BaseName();
 }
 
-void DownloadItem::Interrupted(int64 size, InterruptReason reason) {
+void DownloadItemImpl::Interrupted(int64 size, InterruptReason reason) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!IsInProgress())
     return;
 
   last_reason_ = reason;
   UpdateSize(size);
   download_stats::RecordDownloadInterrupted(reason,
                                             received_bytes_,
                                             total_bytes_);
   TransitionTo(INTERRUPTED);
 }
 
-void DownloadItem::Delete(DeleteReason reason) {
+void DownloadItemImpl::Delete(DeleteReason reason) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   switch (reason) {
     case DELETE_DUE_TO_USER_DISCARD:
       UMA_HISTOGRAM_ENUMERATION("Download.UserDiscard", GetDangerType(),
                                 DANGEROUS_TYPE_MAX);
       break;
     case DELETE_DUE_TO_BROWSER_SHUTDOWN:
       UMA_HISTOGRAM_ENUMERATION("Download.Discard", GetDangerType(),
                                 DANGEROUS_TYPE_MAX);
       break;
     default:
       NOTREACHED();
   }
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&DeleteDownloadedFile, full_path_));
   Remove();
   // We have now been deleted.
 }
 
-void DownloadItem::Remove() {
+void DownloadItemImpl::Remove() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   download_manager_->AssertQueueStateConsistent(this);
   Cancel(true);
   download_manager_->AssertQueueStateConsistent(this);
 
   TransitionTo(REMOVING);
   download_manager_->RemoveDownload(db_handle_);
   // We have now been deleted.
 }
 
-bool DownloadItem::TimeRemaining(base::TimeDelta* remaining) const {
+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);
   return true;
 }
 
-int64 DownloadItem::CurrentSpeed() const {
+int64 DownloadItemImpl::CurrentSpeed() const {
   if (is_paused_)
     return 0;
   base::TimeDelta diff = base::TimeTicks::Now() - start_tick_;
   int64 diff_ms = diff.InMilliseconds();
   return diff_ms == 0 ? 0 : received_bytes_ * 1000 / diff_ms;
 }
 
-int DownloadItem::PercentComplete() const {
+int DownloadItemImpl::PercentComplete() const {
   // If the delegate is delaying completion of the download, then we have no
   // idea how long it will take.
   if (delegate_delayed_complete_ || total_bytes_ <= 0)
     return -1;
 
   return static_cast<int>(received_bytes_ * 100.0 / total_bytes_);
 }
 
-void DownloadItem::OnPathDetermined(const FilePath& path) {
+void DownloadItemImpl::OnPathDetermined(const FilePath& path) {
   full_path_ = path;
   UpdateTarget();
 }
 
-void DownloadItem::Rename(const FilePath& full_path) {
+void DownloadItemImpl::Rename(const FilePath& full_path) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(20) << __FUNCTION__ << "()"
            << " full_path = \"" << full_path.value() << "\""
            << " " << DebugString(true);
   DCHECK(!full_path.empty());
   full_path_ = full_path;
 }
 
-void DownloadItem::TogglePause() {
+void DownloadItemImpl::TogglePause() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DCHECK(IsInProgress());
   if (is_paused_)
     request_handle_->ResumeRequest();
   else
     request_handle_->PauseRequest();
   is_paused_ = !is_paused_;
   UpdateObservers();
 }
 
-void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) {
+void DownloadItemImpl::OnDownloadCompleting(DownloadFileManager* file_manager) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(20) << __FUNCTION__ << "()"
            << " needs rename = " << NeedsRename()
            << " " << DebugString(true);
-  DCHECK_NE(DANGEROUS, safety_state());
+  DCHECK_NE(DANGEROUS, GetSafetyState());
   DCHECK(file_manager);
 
   if (NeedsRename()) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&DownloadFileManager::RenameCompletingDownloadFile,
-                   file_manager, global_id(),
-                   GetTargetFilePath(), safety_state() == SAFE));
+                   file_manager, GetGlobalId(),
+                   GetTargetFilePath(), GetSafetyState() == SAFE));
     return;
   }
 
   Completed();
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&DownloadFileManager::CompleteDownload,
-                                     file_manager, global_id()));
+                                     file_manager, GetGlobalId()));
 }
 
-void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) {
+void DownloadItemImpl::OnDownloadRenamedToFinalName(const FilePath& full_path) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   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()->ShouldOpenDownload(this)) {
     Completed();
   } else {
     delegate_delayed_complete_ = true;
   }
 }
 
-bool DownloadItem::MatchesQuery(const string16& query) const {
+bool DownloadItemImpl::MatchesQuery(const string16& query) const {
   if (query.empty())
     return true;
 
   DCHECK_EQ(query, base::i18n::ToLower(query));
 
   string16 url_raw(UTF8ToUTF16(GetURL().spec()));
   if (base::i18n::StringSearchIgnoringCaseAndAccents(query, url_raw))
     return true;
 
   // TODO(phajdan.jr): write a test case for the following code.
   // A good test case would be:
   //   "/\xe4\xbd\xa0\xe5\xa5\xbd\xe4\xbd\xa0\xe5\xa5\xbd",
   //   L"/\x4f60\x597d\x4f60\x597d",
   //   "/%E4%BD%A0%E5%A5%BD%E4%BD%A0%E5%A5%BD"
   std::string languages;
   TabContents* tab = GetTabContents();
   if (tab)
     languages = content::GetContentClient()->browser()->GetAcceptLangs(tab);
   string16 url_formatted(net::FormatUrl(GetURL(), languages));
   if (base::i18n::StringSearchIgnoringCaseAndAccents(query, url_formatted))
     return true;
 
-  string16 path(full_path().LossyDisplayName());
+  string16 path(GetFullPath().LossyDisplayName());
   return base::i18n::StringSearchIgnoringCaseAndAccents(query, path);
 }
 
-void DownloadItem::SetFileCheckResults(const DownloadStateInfo& state) {
+void DownloadItemImpl::SetFileCheckResults(const DownloadStateInfo& state) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(20) << " " << __FUNCTION__ << "()" << " this = " << DebugString(true);
   state_info_ = state;
   VLOG(20) << " " << __FUNCTION__ << "()" << " this = " << DebugString(true);
 
   UpdateSafetyState();
 }
 
-DownloadItem::DangerType DownloadItem::GetDangerType() const {
+DownloadItem::DangerType DownloadItemImpl::GetDangerType() const {
   return ::GetDangerType(state_info_.is_dangerous_file,
                          state_info_.is_dangerous_url);
 }
 
-bool DownloadItem::IsDangerous() const {
+bool DownloadItemImpl::IsDangerous() const {
   return GetDangerType() != DownloadItem::NOT_DANGEROUS;
 }
 
-void DownloadItem::MarkFileDangerous() {
+void DownloadItemImpl::MarkFileDangerous() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   state_info_.is_dangerous_file = true;
   UpdateSafetyState();
 }
 
-void DownloadItem::MarkUrlDangerous() {
+void DownloadItemImpl::MarkUrlDangerous() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   state_info_.is_dangerous_url = true;
   UpdateSafetyState();
 }
 
-DownloadPersistentStoreInfo DownloadItem::GetPersistentStoreInfo() const {
-  return DownloadPersistentStoreInfo(full_path(),
+DownloadPersistentStoreInfo DownloadItemImpl::GetPersistentStoreInfo() const {
+  return DownloadPersistentStoreInfo(GetFullPath(),
                                      GetURL(),
-                                     referrer_url(),
-                                     start_time(),
-                                     end_time(),
-                                     received_bytes(),
-                                     total_bytes(),
-                                     state(),
-                                     db_handle(),
-                                     opened());
+                                     GetReferrerUrl(),
+                                     GetStartTime(),
+                                     GetEndTime(),
+                                     GetReceivedBytes(),
+                                     GetTotalBytes(),
+                                     GetState(),
+                                     GetDbHandle(),
+                                     GetOpened());
 }
 
-TabContents* DownloadItem::GetTabContents() const {
+TabContents* DownloadItemImpl::GetTabContents() const {
   if (request_handle_.get())
     return request_handle_->GetTabContents();
   return NULL;
 }
 
-FilePath DownloadItem::GetTargetFilePath() const {
+FilePath DownloadItemImpl::GetTargetFilePath() const {
   return full_path_.DirName().Append(state_info_.target_name);
 }
 
-FilePath DownloadItem::GetFileNameToReportUser() const {
+FilePath DownloadItemImpl::GetFileNameToReportUser() const {
   if (state_info_.path_uniquifier > 0) {
     FilePath name(state_info_.target_name);
     DownloadFile::AppendNumberToPath(&name, state_info_.path_uniquifier);
     return name;
   }
   return state_info_.target_name;
 }
 
-FilePath DownloadItem::GetUserVerifiedFilePath() const {
+FilePath DownloadItemImpl::GetUserVerifiedFilePath() const {
   return (safety_state_ == DownloadItem::SAFE) ?
       GetTargetFilePath() : full_path_;
 }
 
-void DownloadItem::OffThreadCancel(DownloadFileManager* file_manager) {
+void DownloadItemImpl::OffThreadCancel(DownloadFileManager* file_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   request_handle_->CancelRequest();
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&DownloadFileManager::CancelDownload,
-                                     file_manager, global_id()));
+                                     file_manager, GetGlobalId()));
 }
 
-void DownloadItem::Init(bool active) {
+void DownloadItemImpl::Init(bool active) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UpdateTarget();
   if (active) {
     download_stats::RecordDownloadCount(download_stats::START_COUNT);
   }
   VLOG(20) << __FUNCTION__ << "() " << DebugString(true);
 }
 
 // TODO(ahendrickson) -- Move |INTERRUPTED| from |IsCancelled()| to
 // |IsPartialDownload()|, when resuming interrupted downloads is implemented.
-bool DownloadItem::IsPartialDownload() const {
+bool DownloadItemImpl::IsPartialDownload() const {
   return (state_ == IN_PROGRESS);
 }
 
-bool DownloadItem::IsInProgress() const {
+bool DownloadItemImpl::IsInProgress() const {
   return (state_ == IN_PROGRESS);
 }
 
-bool DownloadItem::IsCancelled() const {
+bool DownloadItemImpl::IsCancelled() const {
   return (state_ == CANCELLED) ||
          (state_ == INTERRUPTED);
 }
 
-bool DownloadItem::IsInterrupted() const {
+bool DownloadItemImpl::IsInterrupted() const {
   return (state_ == INTERRUPTED);
 }
 
-bool DownloadItem::IsComplete() const {
+bool DownloadItemImpl::IsComplete() const {
   return (state_ == COMPLETE);
 }
 
-const GURL& DownloadItem::GetURL() const {
+const GURL& DownloadItemImpl::GetURL() const {
   return url_chain_.empty() ?
              GURL::EmptyGURL() : url_chain_.back();
 }
 
-std::string DownloadItem::DebugString(bool verbose) const {
+std::string DownloadItemImpl::DebugString(bool verbose) const {
   std::string description =
       base::StringPrintf("{ id = %d"
                          " state = %s",
                          download_id_.local(),
-                         DebugDownloadStateString(state()));
+                         DebugDownloadStateString(GetState()));
 
   // Construct a string of the URL chain.
   std::string url_list("<none>");
   if (!url_chain_.empty()) {
     std::vector<GURL>::const_iterator iter = url_chain_.begin();
     std::vector<GURL>::const_iterator last = url_chain_.end();
     url_list = (*iter).spec();
     ++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_bytes = %" PRId64
         " received_bytes = %" PRId64
         " is_paused = %c"
         " is_otr = %c"
         " safety_state = %s"
         " url_chain = \n\t\"%s\"\n\t"
         " target_name = \"%" PRFilePath "\""
         " full_path = \"%" PRFilePath "\"",
-        db_handle(),
-        total_bytes(),
-        received_bytes(),
-        is_paused() ? 'T' : 'F',
-        is_otr() ? 'T' : 'F',
-        DebugSafetyStateString(safety_state()),
+        GetDbHandle(),
+        GetTotalBytes(),
+        GetReceivedBytes(),
+        IsPaused() ? 'T' : 'F',
+        IsOtr() ? 'T' : 'F',
+        DebugSafetyStateString(GetSafetyState()),
         url_list.c_str(),
         state_info_.target_name.value().c_str(),
-        full_path().value().c_str());
+        GetFullPath().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 FilePath& DownloadItemImpl::GetFullPath() const { return full_path_; }
+void DownloadItemImpl::SetPathUniquifier(int uniquifier) {
+  state_info_.path_uniquifier = uniquifier;
+}
+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_;
+}
+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_; }
+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::SetDbHandle(int64 handle) { db_handle_ = handle; }
+int64 DownloadItemImpl::GetDbHandle() const { return db_handle_; }
+DownloadManager* DownloadItemImpl::GetDownloadManager() {
+  return download_manager_;
+}
+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_; }
+const FilePath& DownloadItemImpl::GetTargetName() const {
+  return state_info_.target_name;
+}
+bool DownloadItemImpl::PromptUserForSaveLocation() const {
+  return state_info_.prompt_user_for_save_location;
+}
+const FilePath& DownloadItemImpl::GetSuggestedPath() const {
+  return state_info_.suggested_path;
+}
+bool DownloadItemImpl::IsTemporary() const { return is_temporary_; }
+void DownloadItemImpl::SetOpened(bool opened) { opened_ = opened; }
+bool DownloadItemImpl::GetOpened() const { return opened_; }
+InterruptReason DownloadItemImpl::GetLastReason() const {
+  return last_reason_;
+}
+DownloadStateInfo DownloadItemImpl::GetStateInfo() const { return state_info_; }
+bool DownloadItemImpl::NeedsRename() const {
+  return state_info_.target_name != full_path_.BaseName();
+}
+void DownloadItemImpl::MockDownloadOpenForTesting() { open_enabled_ = false; }