Return error to chrome.downloads.removeFile

chrome/browser/extensions/api/downloads/downloads_api.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 "chrome/browser/extensions/api/downloads/downloads_api.h"
 
 #include <algorithm>
 #include <cctype>
 #include <iterator>
 #include <set>
@@ skipping 71 matching lines @@
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 
 namespace download_extension_errors {
 
 const char kEmptyFile[] = "Filename not yet determined";
 const char kFileAlreadyDeleted[] = "Download file already deleted";
+const char kFileNotRemoved[] = "Unable to remove file";
 const char kIconNotFound[] = "Icon not found";
 const char kInvalidDangerType[] = "Invalid danger type";
 const char kInvalidFilename[] = "Invalid filename";
 const char kInvalidFilter[] = "Invalid query filter";
 const char kInvalidHeader[] = "Invalid request header";
 const char kInvalidId[] = "Invalid downloadId";
 const char kInvalidOrderBy[] = "Invalid orderBy field";
 const char kInvalidQueryLimit[] = "Invalid query limit";
 const char kInvalidState[] = "Invalid state";
 const char kInvalidURL[] = "Invalid URL";
@@ skipping 1091 matching lines @@
        it != results.end(); ++it) {
     json_results->Append(
         new base::FundamentalValue(static_cast<int>((*it)->GetId())));
     (*it)->Remove();
   }
   SetResult(json_results);
   RecordApiFunctions(DOWNLOADS_FUNCTION_ERASE);
   return true;
 }
 
-DownloadsRemoveFileFunction::DownloadsRemoveFileFunction()
-    : item_(NULL) {
+DownloadsRemoveFileFunction::DownloadsRemoveFileFunction() {
 }
 
 DownloadsRemoveFileFunction::~DownloadsRemoveFileFunction() {
-  if (item_) {
-    item_->RemoveObserver(this);
-    item_ = NULL;
-  }
 }
 
 bool DownloadsRemoveFileFunction::RunImpl() {
   scoped_ptr<downloads::RemoveFile::Params> params(
       downloads::RemoveFile::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   DownloadItem* download_item =
       GetDownload(GetProfile(), include_incognito(), params->download_id);
   if (InvalidId(download_item, &error_) ||
       Fault((download_item->GetState() != DownloadItem::COMPLETE),
             errors::kNotComplete, &error_) ||
       Fault(download_item->GetFileExternallyRemoved(),
             errors::kFileAlreadyDeleted, &error_))
     return false;
-  item_ = download_item;
-  item_->AddObserver(this);
   RecordApiFunctions(DOWNLOADS_FUNCTION_REMOVE_FILE);
-  download_item->DeleteFile();
+  download_item->DeleteFile(
+      base::Bind(&DownloadsRemoveFileFunction::Done, this));
   return true;
 }
 
-void DownloadsRemoveFileFunction::OnDownloadUpdated(DownloadItem* download) {
+void DownloadsRemoveFileFunction::Done(bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK_EQ(item_, download);
-  if (!item_->GetFileExternallyRemoved())
-    return;
-  item_->RemoveObserver(this);
-  item_ = NULL;
-  SendResponse(true);
-}
-
-void DownloadsRemoveFileFunction::OnDownloadDestroyed(DownloadItem* download) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK_EQ(item_, download);
-  item_->RemoveObserver(this);
-  item_ = NULL;
-  SendResponse(true);
+  if (!success) {
+    error_ = errors::kFileNotRemoved;
+  }
+  SendResponse(error_.empty());
 }
 
 DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {}
 
 DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
 DownloadsAcceptDangerFunction::OnPromptCreatedCallback*
     DownloadsAcceptDangerFunction::on_prompt_created_ = NULL;
 
 bool DownloadsAcceptDangerFunction::RunImpl() {
@@ skipping 647 matching lines @@
       extensions::UnloadedExtensionInfo* unloaded =
           content::Details<extensions::UnloadedExtensionInfo>(details).ptr();
       std::set<const extensions::Extension*>::iterator iter =
         shelf_disabling_extensions_.find(unloaded->extension);
       if (iter != shelf_disabling_extensions_.end())
         shelf_disabling_extensions_.erase(iter);
       break;
     }
   }
 }