Index: content/browser/download/save_file_manager.cc |
diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc |
index f96230ee3e5cff2adf6057de1cb38e5a52cbf780..e7e74c2aad6ef880c78f7aa29d9af6106a398b99 100644 |
--- a/content/browser/download/save_file_manager.cc |
+++ b/content/browser/download/save_file_manager.cc |
@@ -43,7 +43,7 @@ void SaveFileManager::Shutdown() { |
// Stop file thread operations. |
void SaveFileManager::OnShutdown() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
STLDeleteValues(&save_file_map_); |
} |
@@ -59,14 +59,14 @@ SaveFile* SaveFileManager::LookupSaveFile(int save_id) { |
// file a request from the file thread to the IO thread to generate a |
// unique save ID. |
int SaveFileManager::GetNextId() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
return next_id_++; |
} |
void SaveFileManager::RegisterStartingRequest(const GURL& save_url, |
SavePackage* save_package) { |
// Make sure it runs in the UI thread. |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
int contents_id = save_package->contents_id(); |
// Register this starting request. |
@@ -80,7 +80,7 @@ void SaveFileManager::RegisterStartingRequest(const GURL& save_url, |
SavePackage* SaveFileManager::UnregisterStartingRequest( |
const GURL& save_url, int contents_id) { |
// Make sure it runs in UI thread. |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ContentsToStartingRequestsMap::iterator it = |
contents_starting_requests_.find(contents_id); |
@@ -104,7 +104,7 @@ SavePackage* SaveFileManager::UnregisterStartingRequest( |
// Look up a SavePackage according to a save id. |
SavePackage* SaveFileManager::LookupPackage(int save_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
SavePackageMap::iterator it = packages_.find(save_id); |
if (it != packages_.end()) |
return it->second; |
@@ -121,7 +121,7 @@ void SaveFileManager::SaveURL( |
const base::FilePath& file_full_path, |
ResourceContext* context, |
SavePackage* save_package) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
// Register a saving job. |
RegisterStartingRequest(url, save_package); |
@@ -159,7 +159,7 @@ void SaveFileManager::SaveURL( |
void SaveFileManager::RemoveSaveFile(int save_id, const GURL& save_url, |
SavePackage* package) { |
DCHECK(package); |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
// A save page job (SavePackage) can only have one manager, |
// so remove it if it exists. |
if (save_id == -1) { |
@@ -191,7 +191,7 @@ SavePackage* SaveFileManager::GetSavePackageFromRenderIds( |
void SaveFileManager::DeleteDirectoryOrFile(const base::FilePath& full_path, |
bool is_dir) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
BrowserThread::PostTask( |
BrowserThread::FILE, FROM_HERE, |
base::Bind(&SaveFileManager::OnDeleteDirectoryOrFile, |
@@ -212,7 +212,7 @@ void SaveFileManager::SendCancelRequest(int save_id) { |
// to create a SaveFile which will hold and finally destroy |info|. It will |
// then passes |info| to the UI thread for reporting saving status. |
void SaveFileManager::StartSave(SaveFileCreateInfo* info) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
DCHECK(info); |
// No need to calculate hash. |
SaveFile* save_file = new SaveFile(info, false); |
@@ -236,7 +236,7 @@ void SaveFileManager::StartSave(SaveFileCreateInfo* info) { |
void SaveFileManager::UpdateSaveProgress(int save_id, |
net::IOBuffer* data, |
int data_len) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
SaveFile* save_file = LookupSaveFile(save_id); |
if (save_file) { |
DCHECK(save_file->InProgress()); |
@@ -267,7 +267,7 @@ void SaveFileManager::SaveFinished(int save_id, |
<< " save_id = " << save_id |
<< " save_url = \"" << save_url.spec() << "\"" |
<< " is_success = " << is_success; |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
SaveFileMap::iterator it = save_file_map_.find(save_id); |
if (it != save_file_map_.end()) { |
SaveFile* save_file = it->second; |
@@ -300,7 +300,7 @@ void SaveFileManager::SaveFinished(int save_id, |
// Notifications sent from the file thread and run on the UI thread. |
void SaveFileManager::OnStartSave(const SaveFileCreateInfo* info) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
SavePackage* save_package = |
GetSavePackageFromRenderIds(info->render_process_id, |
info->render_view_id); |
@@ -334,7 +334,7 @@ void SaveFileManager::OnStartSave(const SaveFileCreateInfo* info) { |
void SaveFileManager::OnUpdateSaveProgress(int save_id, int64 bytes_so_far, |
bool write_success) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
SavePackage* package = LookupPackage(save_id); |
if (package) |
package->UpdateSaveProgress(save_id, bytes_so_far, write_success); |
@@ -345,14 +345,14 @@ void SaveFileManager::OnUpdateSaveProgress(int save_id, int64 bytes_so_far, |
void SaveFileManager::OnSaveFinished(int save_id, |
int64 bytes_so_far, |
bool is_success) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
SavePackage* package = LookupPackage(save_id); |
if (package) |
package->SaveFinished(save_id, bytes_so_far, is_success); |
} |
void SaveFileManager::OnErrorFinished(const GURL& save_url, int contents_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
SavePackage* save_package = UnregisterStartingRequest(save_url, contents_id); |
if (save_package) |
save_package->SaveFailed(save_url); |
@@ -366,7 +366,7 @@ void SaveFileManager::OnSaveURL( |
int render_process_host_id, |
int render_view_id, |
ResourceContext* context) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
ResourceDispatcherHostImpl::Get()->BeginSaveFile(url, |
referrer, |
render_process_host_id, |
@@ -376,7 +376,7 @@ void SaveFileManager::OnSaveURL( |
void SaveFileManager::OnRequireSaveJobFromOtherSource( |
SaveFileCreateInfo* info) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
DCHECK_EQ(info->save_id, -1); |
// Generate a unique save id. |
info->save_id = GetNextId(); |
@@ -388,7 +388,7 @@ void SaveFileManager::OnRequireSaveJobFromOtherSource( |
void SaveFileManager::ExecuteCancelSaveRequest(int render_process_id, |
int request_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
ResourceDispatcherHostImpl::Get()->CancelRequest( |
render_process_id, request_id); |
} |
@@ -401,7 +401,7 @@ void SaveFileManager::ExecuteCancelSaveRequest(int render_process_id, |
// sent from the UI thread, the saving job may have already completed and |
// won't exist in our map. |
void SaveFileManager::CancelSave(int save_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
SaveFileMap::iterator it = save_file_map_.find(save_id); |
if (it != save_file_map_.end()) { |
SaveFile* save_file = it->second; |
@@ -436,7 +436,7 @@ void SaveFileManager::CancelSave(int save_id) { |
void SaveFileManager::SaveLocalFile(const GURL& original_file_url, |
int save_id, |
int render_process_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
SaveFile* save_file = LookupSaveFile(save_id); |
if (!save_file) |
return; |
@@ -466,7 +466,7 @@ void SaveFileManager::SaveLocalFile(const GURL& original_file_url, |
void SaveFileManager::OnDeleteDirectoryOrFile(const base::FilePath& full_path, |
bool is_dir) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
DCHECK(!full_path.empty()); |
base::DeleteFile(full_path, is_dir); |
@@ -478,7 +478,7 @@ void SaveFileManager::RenameAllFiles( |
int render_process_id, |
int render_view_id, |
int save_package_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
if (!resource_dir.empty() && !base::PathExists(resource_dir)) |
base::CreateDirectory(resource_dir); |
@@ -504,7 +504,7 @@ void SaveFileManager::RenameAllFiles( |
void SaveFileManager::OnFinishSavePageJob(int render_process_id, |
int render_view_id, |
int save_package_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
SavePackage* save_package = |
GetSavePackageFromRenderIds(render_process_id, render_view_id); |
@@ -515,7 +515,7 @@ void SaveFileManager::OnFinishSavePageJob(int render_process_id, |
void SaveFileManager::RemoveSavedFileFromFileMap( |
const SaveIDList& save_ids) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
for (SaveIDList::const_iterator i = save_ids.begin(); |
i != save_ids.end(); ++i) { |