summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/save_file_manager.cc
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-18 18:32:45 +0000
committerBen Murdoch <benm@google.com>2010-11-18 18:38:07 +0000
commit513209b27ff55e2841eac0e4120199c23acce758 (patch)
treeaeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/download/save_file_manager.cc
parent164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff)
downloadexternal_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/download/save_file_manager.cc')
-rw-r--r--chrome/browser/download/save_file_manager.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/download/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc
index 3cc3daf..2c432a7 100644
--- a/chrome/browser/download/save_file_manager.cc
+++ b/chrome/browser/download/save_file_manager.cc
@@ -138,7 +138,7 @@ void SaveFileManager::SaveURL(const GURL& url,
referrer,
render_process_host_id,
render_view_id,
- request_context_getter));
+ make_scoped_refptr(request_context_getter)));
} else {
// We manually start the save job.
SaveFileCreateInfo* info = new SaveFileCreateInfo(file_full_path,
@@ -250,7 +250,6 @@ void SaveFileManager::UpdateSaveProgress(int save_id,
this, &SaveFileManager::OnUpdateSaveProgress, save_file->save_id(),
save_file->bytes_so_far(), write_success));
}
- data->Release();
}
// The IO thread will call this when saving is completed or it got error when
@@ -260,7 +259,7 @@ void SaveFileManager::UpdateSaveProgress(int save_id,
// thread, which will use the save URL to find corresponding request record and
// delete it.
void SaveFileManager::SaveFinished(int save_id,
- GURL save_url,
+ const GURL& save_url,
int render_process_id,
bool is_success) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ -339,7 +338,7 @@ void SaveFileManager::OnSaveFinished(int save_id,
package->SaveFinished(save_id, bytes_so_far, is_success);
}
-void SaveFileManager::OnErrorFinished(GURL save_url, int tab_id) {
+void SaveFileManager::OnErrorFinished(const GURL& save_url, int tab_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
SavePackage* save_package = UnregisterStartingRequest(save_url, tab_id);
if (save_package)