Implement chrome.experimental.downloads.search()

content/browser/download/download_item.cc

Index: content/browser/download/download_item.cc
diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc
index b8dfbd1969491e844918d6727dad197abbc1f199..ac8956d9ed586ef4393d07a1dc9078754028855c 100644
--- a/content/browser/download/download_item.cc
+++ b/content/browser/download/download_item.cc
@@ -63,13 +63,13 @@ static void DeleteDownloadedFile(const FilePath& path) {
     file_util::Delete(path, false);
 }
 
-const char* DebugSafetyStateString(DownloadItem::SafetyState state) {
+const char* DebugSafetyStateString(DownloadItemInterface::SafetyState state) {
   switch (state) {
-    case DownloadItem::SAFE:
+    case DownloadItemInterface::SAFE:
       return "SAFE";
-    case DownloadItem::DANGEROUS:
+    case DownloadItemInterface::DANGEROUS:
       return "DANGEROUS";
-    case DownloadItem::DANGEROUS_BUT_VALIDATED:
+    case DownloadItemInterface::DANGEROUS_BUT_VALIDATED:
       return "DANGEROUS_BUT_VALIDATED";
     default:
       NOTREACHED() << "Unknown safety state " << state;
@@ -77,17 +77,18 @@ const char* DebugSafetyStateString(DownloadItem::SafetyState state) {
   };
 }
 
-const char* DebugDownloadStateString(DownloadItem::DownloadState state) {
+const char* DebugDownloadStateString(
+    DownloadItemInterface::DownloadState state) {
   switch (state) {
-    case DownloadItem::IN_PROGRESS:
+    case DownloadItemInterface::IN_PROGRESS:
       return "IN_PROGRESS";
-    case DownloadItem::COMPLETE:
+    case DownloadItemInterface::COMPLETE:
       return "COMPLETE";
-    case DownloadItem::CANCELLED:
+    case DownloadItemInterface::CANCELLED:
       return "CANCELLED";
-    case DownloadItem::REMOVING:
+    case DownloadItemInterface::REMOVING:
       return "REMOVING";
-    case DownloadItem::INTERRUPTED:
+    case DownloadItemInterface::INTERRUPTED:
       return "INTERRUPTED";
     default:
       NOTREACHED() << "Unknown download state " << state;
@@ -95,23 +96,23 @@ const char* DebugDownloadStateString(DownloadItem::DownloadState state) {
   };
 }
 
-DownloadItem::SafetyState GetSafetyState(bool dangerous_file,
+DownloadItemInterface::SafetyState GetSafetyState(bool dangerous_file,
                                          bool dangerous_url) {
   return (dangerous_url || dangerous_file) ?
-      DownloadItem::DANGEROUS : DownloadItem::SAFE;
+      DownloadItemInterface::DANGEROUS : DownloadItemInterface::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,
+DownloadItemInterface::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 DownloadItemInterface::DANGEROUS_URL;
   }
-  return dangerous_file ?
-      DownloadItem::DANGEROUS_FILE : DownloadItem::NOT_DANGEROUS;
+  return dangerous_file ? DownloadItemInterface::DANGEROUS_FILE
+                        : DownloadItemInterface::NOT_DANGEROUS;
 }
 
 }  // namespace
@@ -133,7 +134,7 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
       total_bytes_(info.total_bytes),
       received_bytes_(info.received_bytes),
       start_tick_(base::TimeTicks()),
-      state_(static_cast<DownloadState>(info.state)),
+      state_(static_cast<DownloadItemInterface::DownloadState>(info.state)),
       start_time_(info.start_time),
       end_time_(info.end_time),
       db_handle_(info.db_handle),
@@ -141,7 +142,7 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
       is_paused_(false),
       open_when_complete_(false),
       file_externally_removed_(false),
-      safety_state_(SAFE),
+      safety_state_(DownloadItemInterface::SAFE),
       auto_opened_(false),
       is_otr_(false),
       is_temporary_(false),
@@ -150,7 +151,7 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
       open_enabled_(true),
       delegate_delayed_complete_(false) {
   if (IsInProgress())
-    state_ = CANCELLED;
+    state_ = DownloadItemInterface::CANCELLED;
   if (IsComplete())
     all_data_saved_ = true;
   Init(false /* not actively downloading */);
@@ -179,14 +180,14 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
       received_bytes_(0),
       last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE),
       start_tick_(base::TimeTicks::Now()),
-      state_(IN_PROGRESS),
+      state_(DownloadItemInterface::IN_PROGRESS),
       start_time_(info.start_time),
       db_handle_(DownloadItem::kUninitializedHandle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
       file_externally_removed_(false),
-      safety_state_(SAFE),
+      safety_state_(DownloadItemInterface::SAFE),
       auto_opened_(false),
       is_otr_(is_otr),
       is_temporary_(!info.save_info.file_path.empty()),
@@ -211,14 +212,14 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
       received_bytes_(0),
       last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE),
       start_tick_(base::TimeTicks::Now()),
-      state_(IN_PROGRESS),
+      state_(DownloadItemInterface::IN_PROGRESS),
       start_time_(base::Time::Now()),
       db_handle_(DownloadItem::kUninitializedHandle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
       file_externally_removed_(false),
-      safety_state_(SAFE),
+      safety_state_(DownloadItemInterface::SAFE),
       auto_opened_(false),
       is_otr_(is_otr),
       is_temporary_(false),
@@ -233,7 +234,7 @@ DownloadItem::~DownloadItem() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  TransitionTo(REMOVING);
+  TransitionTo(DownloadItemInterface::REMOVING);
   download_manager_->AssertQueueStateConsistent(this);
 }
 
@@ -310,13 +311,13 @@ void DownloadItem::ShowDownloadInShell() {
 
 void DownloadItem::DangerousDownloadValidated() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK_EQ(DANGEROUS, safety_state());
+  DCHECK_EQ(DownloadItemInterface::DANGEROUS, safety_state());
 
   UMA_HISTOGRAM_ENUMERATION("Download.DangerousDownloadValidated",
                             GetDangerType(),
-                            DANGEROUS_TYPE_MAX);
+                            DownloadItemInterface::DANGEROUS_TYPE_MAX);
 
-  safety_state_ = DANGEROUS_BUT_VALIDATED;
+  safety_state_ = DownloadItemInterface::DANGEROUS_BUT_VALIDATED;
   UpdateObservers();
 
   download_manager_->MaybeCompleteDownload(this);
@@ -383,7 +384,7 @@ void DownloadItem::Cancel(bool user_cancel) {
 
   download_stats::RecordDownloadCount(download_stats::CANCELLED_COUNT);
 
-  TransitionTo(CANCELLED);
+  TransitionTo(DownloadItemInterface::CANCELLED);
   StopProgressTimer();
   if (user_cancel)
     download_manager_->DownloadCancelledInternal(this);
@@ -395,7 +396,7 @@ void DownloadItem::MarkAsComplete() {
 
   DCHECK(all_data_saved_);
   end_time_ = base::Time::Now();
-  TransitionTo(COMPLETE);
+  TransitionTo(DownloadItemInterface::COMPLETE);
 }
 
 void DownloadItem::DelayedDownloadOpened() {
@@ -426,7 +427,7 @@ void DownloadItem::Completed() {
 
   DCHECK(all_data_saved_);
   end_time_ = base::Time::Now();
-  TransitionTo(COMPLETE);
+  TransitionTo(DownloadItemInterface::COMPLETE);
   download_manager_->DownloadCompleted(id());
   download_stats::RecordDownloadCompleted(start_tick_, received_bytes_);
 
@@ -446,7 +447,8 @@ void DownloadItem::Completed() {
   }
 }
 
-void DownloadItem::TransitionTo(DownloadState new_state) {
+void DownloadItem::TransitionTo(
+    DownloadItemInterface::DownloadState new_state) {
   if (state_ == new_state)
     return;
 
@@ -455,7 +457,7 @@ void DownloadItem::TransitionTo(DownloadState new_state) {
 }
 
 void DownloadItem::UpdateSafetyState() {
-  SafetyState updated_value(
+  DownloadItemInterface::SafetyState updated_value(
       GetSafetyState(state_info_.is_dangerous_file,
                      state_info_.is_dangerous_url));
   if (updated_value != safety_state_) {
@@ -485,7 +487,7 @@ void DownloadItem::Interrupted(int64 size, InterruptReason reason) {
   download_stats::RecordDownloadInterrupted(reason,
                                             received_bytes_,
                                             total_bytes_);
-  TransitionTo(INTERRUPTED);
+  TransitionTo(DownloadItemInterface::INTERRUPTED);
 }
 
 void DownloadItem::Delete(DeleteReason reason) {
@@ -495,11 +497,11 @@ void DownloadItem::Delete(DeleteReason reason) {
   switch (reason) {
     case DELETE_DUE_TO_USER_DISCARD:
       UMA_HISTOGRAM_ENUMERATION("Download.UserDiscard", GetDangerType(),
-                                DANGEROUS_TYPE_MAX);
+                                DownloadItemInterface::DANGEROUS_TYPE_MAX);
       break;
     case DELETE_DUE_TO_BROWSER_SHUTDOWN:
       UMA_HISTOGRAM_ENUMERATION("Download.Discard", GetDangerType(),
-                                DANGEROUS_TYPE_MAX);
+                                DownloadItemInterface::DANGEROUS_TYPE_MAX);
       break;
     default:
       NOTREACHED();
@@ -519,7 +521,7 @@ void DownloadItem::Remove() {
   Cancel(true);
   download_manager_->AssertQueueStateConsistent(this);
 
-  TransitionTo(REMOVING);
+  TransitionTo(DownloadItemInterface::REMOVING);
   download_manager_->RemoveDownload(db_handle_);
   // We have now been deleted.
 }
@@ -590,14 +592,14 @@ void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) {
   VLOG(20) << __FUNCTION__ << "()"
            << " needs rename = " << NeedsRename()
            << " " << DebugString(true);
-  DCHECK_NE(DANGEROUS, safety_state());
+  DCHECK_NE(DownloadItemInterface::DANGEROUS, safety_state());
   DCHECK(file_manager);
 
   if (NeedsRename()) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&DownloadFileManager::RenameCompletingDownloadFile,
                    file_manager, global_id(),
-                   GetTargetFilePath(), safety_state() == SAFE));
+                   GetTargetFilePath(), safety_state() == DownloadItemInterface::SAFE));
     return;
   }
 
@@ -665,13 +667,13 @@ void DownloadItem::SetFileCheckResults(const DownloadStateInfo& state) {
   UpdateSafetyState();
 }
 
-DownloadItem::DangerType DownloadItem::GetDangerType() const {
+DownloadItemInterface::DangerType DownloadItem::GetDangerType() const {
   return ::GetDangerType(state_info_.is_dangerous_file,
                          state_info_.is_dangerous_url);
 }
 
 bool DownloadItem::IsDangerous() const {
-  return GetDangerType() != DownloadItem::NOT_DANGEROUS;
+  return GetDangerType() != DownloadItemInterface::NOT_DANGEROUS;
 }
 
 void DownloadItem::MarkFileDangerous() {
@@ -723,7 +725,7 @@ FilePath DownloadItem::GetFileNameToReportUser() const {
 }
 
 FilePath DownloadItem::GetUserVerifiedFilePath() const {
-  return (safety_state_ == DownloadItem::SAFE) ?
+  return (safety_state_ == DownloadItemInterface::SAFE) ?
       GetTargetFilePath() : full_path_;
 }
 
@@ -751,24 +753,24 @@ void DownloadItem::Init(bool active) {
 // TODO(ahendrickson) -- Move |INTERRUPTED| from |IsCancelled()| to
 // |IsPartialDownload()|, when resuming interrupted downloads is implemented.
 bool DownloadItem::IsPartialDownload() const {
-  return (state_ == IN_PROGRESS);
+  return (state_ == DownloadItemInterface::IN_PROGRESS);
 }
 
 bool DownloadItem::IsInProgress() const {
-  return (state_ == IN_PROGRESS);
+  return (state_ == DownloadItemInterface::IN_PROGRESS);
 }
 
 bool DownloadItem::IsCancelled() const {
-  return (state_ == CANCELLED) ||
-         (state_ == INTERRUPTED);
+  return (state_ == DownloadItemInterface::CANCELLED) ||
+         (state_ == DownloadItemInterface::INTERRUPTED);
 }
 
 bool DownloadItem::IsInterrupted() const {
-  return (state_ == INTERRUPTED);
+  return (state_ == DownloadItemInterface::INTERRUPTED);
 }
 
 bool DownloadItem::IsComplete() const {
-  return (state_ == COMPLETE);
+  return (state_ == DownloadItemInterface::COMPLETE);
 }
 
 const GURL& DownloadItem::GetURL() const {