diff options
Diffstat (limited to 'chrome/browser/download')
| -rw-r--r-- | chrome/browser/download/base_file.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/download/base_file_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/download/download_file.cc | 14 | ||||
| -rw-r--r-- | chrome/browser/download/download_file_manager.cc | 70 | ||||
| -rw-r--r-- | chrome/browser/download/download_item.cc | 14 | ||||
| -rw-r--r-- | chrome/browser/download/download_manager.cc | 62 | ||||
| -rw-r--r-- | chrome/browser/download/download_manager.h | 2 | ||||
| -rw-r--r-- | chrome/browser/download/download_manager_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/download/download_prefs.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/download/download_request_limiter.cc | 14 | ||||
| -rw-r--r-- | chrome/browser/download/download_request_limiter_unittest.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/download/download_util.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/download/drag_download_file.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/download/drag_download_util.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/download/save_file.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/download/save_file_manager.cc | 98 | ||||
| -rw-r--r-- | chrome/browser/download/save_package.cc | 46 |
17 files changed, 194 insertions, 193 deletions
diff --git a/chrome/browser/download/base_file.cc b/chrome/browser/download/base_file.cc index f50c1f1..4911d22 100644 --- a/chrome/browser/download/base_file.cc +++ b/chrome/browser/download/base_file.cc @@ -29,18 +29,18 @@ BaseFile::BaseFile(const FilePath& full_path, file_stream_(file_stream), bytes_so_far_(received_bytes), power_save_blocker_(true) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); } BaseFile::~BaseFile() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (in_progress()) Cancel(); Close(); } bool BaseFile::Initialize() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (!full_path_.empty() || download_util::CreateTemporaryFileForDownload(&full_path_)) return Open(); @@ -48,7 +48,7 @@ bool BaseFile::Initialize() { } bool BaseFile::AppendDataToFile(const char* data, size_t data_len) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (!file_stream_.get()) return false; @@ -65,7 +65,7 @@ bool BaseFile::AppendDataToFile(const char* data, size_t data_len) { } bool BaseFile::Rename(const FilePath& new_path, bool is_final_rename) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); // Save the information whether the download is in progress because // it will be overwritten by closing the file. @@ -129,19 +129,19 @@ bool BaseFile::Rename(const FilePath& new_path, bool is_final_rename) { } void BaseFile::Cancel() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); Close(); if (!full_path_.empty()) file_util::Delete(full_path_, false); } void BaseFile::Finish() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); Close(); } void BaseFile::AnnotateWithSourceInformation() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); #if defined(OS_WIN) // Sets the Zone to tell Windows that this file comes from the internet. // We ignore the return value because a failure is not fatal. @@ -155,7 +155,7 @@ void BaseFile::AnnotateWithSourceInformation() { } bool BaseFile::Open() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!full_path_.empty()); // Create a new file steram if it is not provided. @@ -183,7 +183,7 @@ bool BaseFile::Open() { } void BaseFile::Close() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (file_stream_.get()) { #if defined(OS_CHROMEOS) // Currently we don't really care about the return value, since if it fails diff --git a/chrome/browser/download/base_file_unittest.cc b/chrome/browser/download/base_file_unittest.cc index 3c135aa..8138da8 100644 --- a/chrome/browser/download/base_file_unittest.cc +++ b/chrome/browser/download/base_file_unittest.cc @@ -18,7 +18,7 @@ const char kTestData3[] = "Final line."; class BaseFileTest : public testing::Test { public: - BaseFileTest() : file_thread_(ChromeThread::FILE, &message_loop_) { + BaseFileTest() : file_thread_(BrowserThread::FILE, &message_loop_) { } virtual void SetUp() { @@ -39,7 +39,7 @@ class BaseFileTest : public testing::Test { EXPECT_EQ(expected_data_, disk_data); } - // Make sure the mock ChromeThread outlives the BaseFile to satisfy + // Make sure the mock BrowserThread outlives the BaseFile to satisfy // thread checks inside it. base_file_.reset(); } @@ -67,7 +67,7 @@ class BaseFileTest : public testing::Test { // Mock file thread to satisfy debug checks in BaseFile. MessageLoop message_loop_; - ChromeThread file_thread_; + BrowserThread file_thread_; }; // Test the most basic scenario: just create the object and do a sanity check diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc index 6bf41c7..292c30f 100644 --- a/chrome/browser/download/download_file.cc +++ b/chrome/browser/download/download_file.cc @@ -21,24 +21,24 @@ DownloadFile::DownloadFile(const DownloadCreateInfo* info, child_id_(info->child_id), request_id_(info->request_id), download_manager_(download_manager) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); } DownloadFile::~DownloadFile() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); } void DownloadFile::DeleteCrDownload() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); FilePath crdownload = download_util::GetCrDownloadPath(full_path_); file_util::Delete(crdownload, false); } void DownloadFile::CancelDownloadRequest(ResourceDispatcherHost* rdh) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableFunction(&download_util::CancelDownloadRequest, rdh, child_id_, @@ -46,6 +46,6 @@ void DownloadFile::CancelDownloadRequest(ResourceDispatcherHost* rdh) { } DownloadManager* DownloadFile::GetDownloadManager() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); return download_manager_.get(); } diff --git a/chrome/browser/download/download_file_manager.cc b/chrome/browser/download/download_file_manager.cc index fc94314..b053adc 100644 --- a/chrome/browser/download/download_file_manager.cc +++ b/chrome/browser/download/download_file_manager.cc @@ -37,7 +37,7 @@ const int kUpdatePeriodMs = 500; DownloadManager* DownloadManagerForRenderViewHost(int render_process_id, int render_view_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); TabContents* contents = tab_util::GetTabContentsByID(render_process_id, render_view_id); @@ -62,27 +62,27 @@ DownloadFileManager::~DownloadFileManager() { } void DownloadFileManager::Shutdown() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(this, &DownloadFileManager::OnShutdown)); } void DownloadFileManager::OnShutdown() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); StopUpdateTimer(); STLDeleteValues(&downloads_); } void DownloadFileManager::CreateDownloadFile( DownloadCreateInfo* info, DownloadManager* download_manager) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); scoped_ptr<DownloadFile> download_file( new DownloadFile(info, download_manager)); if (!download_file->Initialize()) { - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableFunction(&download_util::CancelDownloadRequest, resource_dispatcher_host_, info->child_id, @@ -97,21 +97,21 @@ void DownloadFileManager::CreateDownloadFile( info->path = info->save_info.file_path; // The file is now ready, we can un-pause the request and start saving data. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod(this, &DownloadFileManager::ResumeDownloadRequest, info->child_id, info->request_id)); StartUpdateTimer(); - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(download_manager, &DownloadManager::StartDownload, info)); } void DownloadFileManager::ResumeDownloadRequest(int child_id, int request_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // This balances the pause in DownloadResourceHandler::OnResponseStarted. resource_dispatcher_host_->PauseRequest(child_id, request_id, false); @@ -123,7 +123,7 @@ DownloadFile* DownloadFileManager::GetDownloadFile(int id) { } void DownloadFileManager::StartUpdateTimer() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (!update_timer_.IsRunning()) { update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdatePeriodMs), this, &DownloadFileManager::UpdateInProgressDownloads); @@ -131,19 +131,19 @@ void DownloadFileManager::StartUpdateTimer() { } void DownloadFileManager::StopUpdateTimer() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); update_timer_.Stop(); } void DownloadFileManager::UpdateInProgressDownloads() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); for (DownloadFileMap::iterator i = downloads_.begin(); i != downloads_.end(); ++i) { int id = i->first; DownloadFile* download_file = i->second; DownloadManager* manager = download_file->GetDownloadManager(); if (manager) { - ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(manager, &DownloadManager::UpdateDownload, id, download_file->bytes_so_far())); } @@ -153,19 +153,19 @@ void DownloadFileManager::UpdateInProgressDownloads() { // Called on the IO thread once the ResourceDispatcherHost has decided that a // request is a download. int DownloadFileManager::GetNextId() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); return next_id_++; } void DownloadFileManager::StartDownload(DownloadCreateInfo* info) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(info); DownloadManager* manager = DownloadManagerForRenderViewHost( info->child_id, info->render_view_id); if (!manager) { - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableFunction(&download_util::CancelDownloadRequest, resource_dispatcher_host_, info->child_id, @@ -174,7 +174,7 @@ void DownloadFileManager::StartDownload(DownloadCreateInfo* info) { return; } - ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(this, &DownloadFileManager::CreateDownloadFile, info, manager)); } @@ -185,7 +185,7 @@ void DownloadFileManager::StartDownload(DownloadCreateInfo* info) { // thread gets the cancel message: we just delete the data since the // DownloadFile has been deleted. void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); std::vector<DownloadBuffer::Contents> contents; { AutoLock auto_lock(buffer->lock); @@ -203,7 +203,7 @@ void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) { } void DownloadFileManager::OnResponseCompleted(int id, DownloadBuffer* buffer) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); delete buffer; DownloadFileMap::iterator it = downloads_.find(id); if (it != downloads_.end()) { @@ -212,8 +212,8 @@ void DownloadFileManager::OnResponseCompleted(int id, DownloadBuffer* buffer) { DownloadManager* download_manager = download->GetDownloadManager(); if (download_manager) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( download_manager, &DownloadManager::OnAllDataSaved, id, download->bytes_so_far())); @@ -235,7 +235,7 @@ void DownloadFileManager::OnResponseCompleted(int id, DownloadBuffer* buffer) { // run on the download thread. Since this message has been sent from the UI // thread, the download may have already completed and won't exist in our map. void DownloadFileManager::CancelDownload(int id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DownloadFileMap::iterator it = downloads_.find(id); if (it != downloads_.end()) { DownloadFile* download = it->second; @@ -252,7 +252,7 @@ void DownloadFileManager::CancelDownload(int id) { } void DownloadFileManager::OnDownloadManagerShutdown(DownloadManager* manager) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(manager); std::set<DownloadFile*> to_remove; @@ -280,7 +280,7 @@ void DownloadFileManager::OnDownloadManagerShutdown(DownloadManager* manager) { void DownloadFileManager::OnIntermediateDownloadName( int id, const FilePath& full_path, DownloadManager* download_manager) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DownloadFileMap::iterator it = downloads_.find(id); if (it == downloads_.end()) return; @@ -307,7 +307,7 @@ void DownloadFileManager::OnFinalDownloadName(int id, const FilePath& full_path, bool need_delete_crdownload, DownloadManager* manager) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DownloadFile* download = GetDownloadFile(id); if (!download) @@ -319,8 +319,8 @@ void DownloadFileManager::OnFinalDownloadName(int id, // http://crbug.com/13120 for details. download->AnnotateWithSourceInformation(); #endif - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( manager, &DownloadManager::DownloadRenamedToFinalName, id, full_path)); @@ -347,7 +347,7 @@ void DownloadFileManager::OnFinalDownloadName(int id, // Called only from OnFinalDownloadName or OnIntermediateDownloadName // on the FILE thread. void DownloadFileManager::CancelDownloadOnRename(int id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DownloadFile* download = GetDownloadFile(id); if (!download) @@ -359,8 +359,8 @@ void DownloadFileManager::CancelDownloadOnRename(int id) { return; } - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(download_manager, &DownloadManager::DownloadCancelled, id)); } diff --git a/chrome/browser/download/download_item.cc b/chrome/browser/download/download_item.cc index 787b8ad..b1788de 100644 --- a/chrome/browser/download/download_item.cc +++ b/chrome/browser/download/download_item.cc @@ -28,7 +28,7 @@ namespace { const int kUpdateTimeMs = 1000; void DeleteDownloadedFile(const FilePath& path) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); // Make sure we only delete files. if (!file_util::DirectoryExists(path)) @@ -201,8 +201,8 @@ void DownloadItem::OpenDownload() { // Mac OS X requires opening downloads on the UI thread. platform_util::OpenItem(full_path()); #else - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableFunction(&platform_util::OpenItem, full_path())); #endif } @@ -213,8 +213,8 @@ void DownloadItem::ShowDownloadInShell() { // Mac needs to run this operation on the UI thread. platform_util::ShowItemInFolder(full_path()); #else - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableFunction(&platform_util::ShowItemInFolder, full_path())); #endif @@ -307,8 +307,8 @@ void DownloadItem::Remove(bool delete_on_disk) { Cancel(true); state_ = REMOVING; if (delete_on_disk) { - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableFunction(&DeleteDownloadedFile, full_path_)); } download_manager_->RemoveDownload(db_handle_); diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index b90feaf..7faa64a 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -73,7 +73,7 @@ void DownloadManager::Shutdown() { FOR_EACH_OBSERVER(Observer, observers_, ManagerGoingDown()); if (file_manager_) { - ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &DownloadFileManager::OnDownloadManagerShutdown, this)); @@ -250,7 +250,7 @@ bool DownloadManager::Init(Profile* profile) { // point. OnCreateDatabaseEntryComplete() handles that finalization of the the // download creation as a callback from the history thread. void DownloadManager::StartDownload(DownloadCreateInfo* info) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(info); // Check whether this download is for an extension install or not. @@ -302,8 +302,8 @@ void DownloadManager::StartDownload(DownloadCreateInfo* info) { // the suggested path on the UI thread. // We can only access preferences on the UI thread, so check the download path // now and pass the value to the FILE thread. - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( this, &DownloadManager::CheckIfSuggestedPathExists, @@ -313,7 +313,7 @@ void DownloadManager::StartDownload(DownloadCreateInfo* info) { void DownloadManager::CheckIfSuggestedPathExists(DownloadCreateInfo* info, const FilePath& default_path) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(info); // Make sure the default download directory exists. @@ -378,15 +378,15 @@ void DownloadManager::CheckIfSuggestedPathExists(DownloadCreateInfo* info, info->suggested_path), "", 0); } - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &DownloadManager::OnPathExistenceAvailable, info)); } void DownloadManager::OnPathExistenceAvailable(DownloadCreateInfo* info) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(info); if (info->prompt_user_for_save_location) { @@ -417,7 +417,7 @@ void DownloadManager::OnPathExistenceAvailable(DownloadCreateInfo* info) { void DownloadManager::CreateDownloadItem(DownloadCreateInfo* info, const FilePath& target_path) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); scoped_ptr<DownloadCreateInfo> infop(info); info->path = target_path; @@ -434,8 +434,8 @@ void DownloadManager::CreateDownloadItem(DownloadCreateInfo* info, // The download has already finished or the download is not safe. // We can now rename the file to its final name (or its tentative name // in dangerous download cases). - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( file_manager_, &DownloadFileManager::OnFinalDownloadName, download->id(), target_path, !info->is_dangerous, this)); @@ -443,8 +443,8 @@ void DownloadManager::CreateDownloadItem(DownloadCreateInfo* info, // The download hasn't finished and it is a safe download. We need to // rename it to its intermediate '.crdownload' path. FilePath download_path = download_util::GetCrDownloadPath(target_path); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( file_manager_, &DownloadFileManager::OnIntermediateDownloadName, download->id(), download_path, this)); @@ -519,8 +519,8 @@ void DownloadManager::OnAllDataSaved(int32 download_id, int64 size) { if (download->safety_state() == DownloadItem::DANGEROUS_BUT_VALIDATED) { // We first need to rename the downloaded file from its temporary name to // its final name before we can continue. - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( this, &DownloadManager::ProceedWithFinishedDangerousDownload, download->db_handle(), @@ -529,8 +529,8 @@ void DownloadManager::OnAllDataSaved(int32 download_id, int64 size) { } if (download->need_final_rename()) { - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( file_manager_, &DownloadFileManager::OnFinalDownloadName, download->id(), download->full_path(), false, this)); @@ -542,7 +542,7 @@ void DownloadManager::OnAllDataSaved(int32 download_id, int64 size) { void DownloadManager::DownloadRenamedToFinalName(int download_id, const FilePath& full_path) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DownloadItem* item = GetDownloadItem(download_id); if (!item) @@ -558,7 +558,7 @@ void DownloadManager::DownloadRenamedToFinalName(int download_id, } void DownloadManager::ContinueDownloadFinished(DownloadItem* download) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // If this was a dangerous download, it has now been approved and must be // removed from dangerous_finished_ so it does not get deleted on shutdown. @@ -590,8 +590,8 @@ void DownloadManager::ProceedWithFinishedDangerousDownload( NOTREACHED(); } - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &DownloadManager::DangerousDownloadRenamed, download_handle, success, new_path, uniquifier)); } @@ -643,15 +643,15 @@ void DownloadManager::DownloadCancelledInternal(int download_id, int render_process_id, int request_id) { // Cancel the network request. RDH is guaranteed to outlive the IO thread. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableFunction(&download_util::CancelDownloadRequest, g_browser_process->resource_dispatcher_host(), render_process_id, request_id)); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( file_manager_, &DownloadFileManager::CancelDownload, download_id)); } @@ -665,8 +665,8 @@ void DownloadManager::PauseDownload(int32 download_id, bool pause) { if (pause == download->is_paused()) return; - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod(this, &DownloadManager::PauseDownloadRequest, g_browser_process->resource_dispatcher_host(), @@ -690,7 +690,7 @@ void DownloadManager::PauseDownloadRequest(ResourceDispatcherHost* rdh, int render_process_id, int request_id, bool pause) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); rdh->PauseRequest(render_process_id, request_id, pause); } @@ -791,7 +791,7 @@ void DownloadManager::DownloadUrlToFile(const GURL& url, const DownloadSaveInfo& save_info, TabContents* tab_contents) { DCHECK(tab_contents); - ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, NewRunnableFunction(&download_util::DownloadUrl, url, referrer, @@ -887,8 +887,8 @@ void DownloadManager::DangerousDownloadValidated(DownloadItem* download) { if (download->state() != DownloadItem::COMPLETE) return; - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( this, &DownloadManager::ProceedWithFinishedDangerousDownload, download->db_handle(), download->full_path(), diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h index 8cacf02..0a90816 100644 --- a/chrome/browser/download/download_manager.h +++ b/chrome/browser/download/download_manager.h @@ -60,7 +60,7 @@ struct DownloadSaveInfo; // Browser's download manager: manages all downloads and destination view. class DownloadManager : public base::RefCountedThreadSafe<DownloadManager, - ChromeThread::DeleteOnUIThread>, + BrowserThread::DeleteOnUIThread>, public DownloadStatusUpdaterDelegate, public SelectFileDialog::Listener { // For testing. diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index af2a59a..a1fb8cb 100644 --- a/chrome/browser/download/download_manager_unittest.cc +++ b/chrome/browser/download/download_manager_unittest.cc @@ -37,7 +37,7 @@ class DownloadManagerTest : public testing::Test { DownloadManagerTest() : profile_(new TestingProfile()), download_manager_(new MockDownloadManager(&download_status_updater_)), - ui_thread_(ChromeThread::UI, &message_loop_) { + ui_thread_(BrowserThread::UI, &message_loop_) { download_manager_->Init(profile_.get()); } @@ -60,7 +60,7 @@ class DownloadManagerTest : public testing::Test { scoped_refptr<DownloadManager> download_manager_; scoped_refptr<DownloadFileManager> file_manager_; MessageLoopForUI message_loop_; - ChromeThread ui_thread_; + BrowserThread ui_thread_; DownloadFileManager* file_manager() { if (!file_manager_) { @@ -213,7 +213,7 @@ TEST_F(DownloadManagerTest, DownloadRenameTest) { using ::testing::Invoke; using ::testing::Return; - ChromeThread file_thread(ChromeThread::FILE, &message_loop_); + BrowserThread file_thread(BrowserThread::FILE, &message_loop_); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDownloadRenameCases); ++i) { // |info| will be destroyed in download_manager_. diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index 9639779..f37561d 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -53,8 +53,8 @@ void DownloadPrefs::RegisterUserPrefs(PrefService* prefs) { #if defined(OS_CHROMEOS) // Ensure that the download directory specified in the preferences exists. - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableFunction(&file_util::CreateDirectory, default_download_path)); #endif // defined(OS_CHROMEOS) diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc index 472a2c5..8833699 100644 --- a/chrome/browser/download/download_request_limiter.cc +++ b/chrome/browser/download/download_request_limiter.cc @@ -192,9 +192,9 @@ void DownloadRequestLimiter::CanDownloadOnIOThread(int render_process_host_id, Callback* callback) { // This is invoked on the IO thread. Schedule the task to run on the UI // thread so that we can query UI state. - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &DownloadRequestLimiter::CanDownload, render_process_host_id, render_view_id, callback)); } @@ -233,7 +233,7 @@ DownloadRequestLimiter::TabDownloadState* DownloadRequestLimiter:: void DownloadRequestLimiter::CanDownload(int render_process_host_id, int render_view_id, Callback* callback) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); TabContents* originating_tab = tab_util::GetTabContentsByID(render_process_host_id, render_view_id); @@ -296,14 +296,14 @@ void DownloadRequestLimiter::CanDownloadImpl( void DownloadRequestLimiter::ScheduleNotification(Callback* callback, bool allow) { - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &DownloadRequestLimiter::NotifyCallback, callback, allow)); } void DownloadRequestLimiter::NotifyCallback(Callback* callback, bool allow) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (allow) callback->ContinueDownload(); else diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc index cf0d90d..5d1cc3a 100644 --- a/chrome/browser/download/download_request_limiter_unittest.cc +++ b/chrome/browser/download/download_request_limiter_unittest.cc @@ -13,7 +13,8 @@ class DownloadRequestLimiterTest : public RenderViewHostTestHarness, public DownloadRequestLimiter::Callback { public: - DownloadRequestLimiterTest() : io_thread_(ChromeThread::IO, &message_loop_) {} + DownloadRequestLimiterTest() : io_thread_(BrowserThread::IO, &message_loop_) { + } virtual void SetUp() { RenderViewHostTestHarness::SetUp(); @@ -85,7 +86,7 @@ class DownloadRequestLimiterTest // Number of times ShouldAllowDownload was invoked. int ask_allow_count_; - ChromeThread io_thread_; + BrowserThread io_thread_; }; TEST_F(DownloadRequestLimiterTest, Allow) { diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 9b121b5..f02cdc4 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -230,7 +230,7 @@ void GenerateSafeFileName(const std::string& mime_type, FilePath* file_name) { void OpenChromeExtension(Profile* profile, DownloadManager* download_manager, const DownloadItem& download_item) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(download_item.is_extension_install()); // We don't support extensions in OTR mode. @@ -683,7 +683,7 @@ void DownloadUrl( int render_process_host_id, int render_view_id, URLRequestContextGetter* request_context_getter) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); URLRequestContext* context = request_context_getter->GetURLRequestContext(); context->set_referrer_charset(referrer_charset); @@ -700,7 +700,7 @@ void DownloadUrl( void CancelDownloadRequest(ResourceDispatcherHost* rdh, int render_process_id, int request_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); rdh->CancelRequest(render_process_id, request_id, false); } diff --git a/chrome/browser/download/drag_download_file.cc b/chrome/browser/download/drag_download_file.cc index ad99b75..3b01f0a 100644 --- a/chrome/browser/download/drag_download_file.cc +++ b/chrome/browser/download/drag_download_file.cc @@ -95,9 +95,9 @@ void DragDownloadFile::Stop() { void DragDownloadFile::InitiateDownload() { #if defined(OS_WIN) // DownloadManager could only be invoked from the UI thread. - if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &DragDownloadFile::InitiateDownload)); return; @@ -193,7 +193,7 @@ void DragDownloadFile::AssertCurrentlyOnDragThread() { void DragDownloadFile::AssertCurrentlyOnUIThread() { // Only do the check on Windows where two threads are involved. #if defined(OS_WIN) - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); #endif } diff --git a/chrome/browser/download/drag_download_util.cc b/chrome/browser/download/drag_download_util.cc index 29fd84e..41527c2 100644 --- a/chrome/browser/download/drag_download_util.cc +++ b/chrome/browser/download/drag_download_util.cc @@ -92,14 +92,14 @@ void PromiseFileFinalizer::Cleanup() { } void PromiseFileFinalizer::OnDownloadCompleted(const FilePath& file_path) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &PromiseFileFinalizer::Cleanup)); } void PromiseFileFinalizer::OnDownloadAborted() { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &PromiseFileFinalizer::Cleanup)); } diff --git a/chrome/browser/download/save_file.cc b/chrome/browser/download/save_file.cc index 98667a3..58001cc 100644 --- a/chrome/browser/download/save_file.cc +++ b/chrome/browser/download/save_file.cc @@ -11,12 +11,12 @@ SaveFile::SaveFile(const SaveFileCreateInfo* info) : BaseFile(FilePath(), info->url, GURL(), 0, linked_ptr<net::FileStream>()), info_(info) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(info); DCHECK(info->path.empty()); } SaveFile::~SaveFile() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); } diff --git a/chrome/browser/download/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc index 00e9251..3040823 100644 --- a/chrome/browser/download/save_file_manager.cc +++ b/chrome/browser/download/save_file_manager.cc @@ -41,14 +41,14 @@ SaveFileManager::~SaveFileManager() { // Called during the browser shutdown process to clean up any state (open files, // timers) that live on the saving thread (file thread). void SaveFileManager::Shutdown() { - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(this, &SaveFileManager::OnShutdown)); } // Stop file thread operations. void SaveFileManager::OnShutdown() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); STLDeleteValues(&save_file_map_); } @@ -64,14 +64,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(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); return next_id_++; } void SaveFileManager::RegisterStartingRequest(const GURL& save_url, SavePackage* save_package) { // Make sure it runs in the UI thread. - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); int tab_id = save_package->tab_id(); // Register this starting request. @@ -84,7 +84,7 @@ void SaveFileManager::RegisterStartingRequest(const GURL& save_url, SavePackage* SaveFileManager::UnregisterStartingRequest( const GURL& save_url, int tab_id) { // Make sure it runs in UI thread. - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); TabToStartingRequestsMap::iterator it = tab_starting_requests_.find(tab_id); if (it != tab_starting_requests_.end()) { @@ -107,7 +107,7 @@ SavePackage* SaveFileManager::UnregisterStartingRequest( // Look up a SavePackage according to a save id. SavePackage* SaveFileManager::LookupPackage(int save_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); SavePackageMap::iterator it = packages_.find(save_id); if (it != packages_.end()) return it->second; @@ -123,15 +123,15 @@ void SaveFileManager::SaveURL(const GURL& url, const FilePath& file_full_path, URLRequestContextGetter* request_context_getter, SavePackage* save_package) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // Register a saving job. RegisterStartingRequest(url, save_package); if (save_source == SaveFileCreateInfo::SAVE_FILE_FROM_NET) { DCHECK(url.is_valid()); - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod(this, &SaveFileManager::OnSaveURL, url, @@ -150,8 +150,8 @@ void SaveFileManager::SaveURL(const GURL& url, // Since the data will come from render process, so we need to start // this kind of save job by ourself. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &SaveFileManager::OnRequireSaveJobFromOtherSource, info)); } @@ -166,7 +166,7 @@ void SaveFileManager::SaveURL(const GURL& url, void SaveFileManager::RemoveSaveFile(int save_id, const GURL& save_url, SavePackage* package) { DCHECK(package); - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // A save page job(SavePackage) can only have one manager, // so remove it if it exists. if (save_id == -1) { @@ -196,9 +196,9 @@ SavePackage* SaveFileManager::GetSavePackageFromRenderIds( // Utility function for deleting specified file. void SaveFileManager::DeleteDirectoryOrFile(const FilePath& full_path, bool is_dir) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod( this, &SaveFileManager::OnDeleteDirectoryOrFile, full_path, is_dir)); } @@ -206,8 +206,8 @@ void SaveFileManager::DeleteDirectoryOrFile(const FilePath& full_path, void SaveFileManager::SendCancelRequest(int save_id) { // Cancel the request which has specific save id. DCHECK_GT(save_id, -1); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(this, &SaveFileManager::CancelSave, save_id)); } @@ -217,7 +217,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(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(info); SaveFile* save_file = new SaveFile(info); @@ -228,8 +228,8 @@ void SaveFileManager::StartSave(SaveFileCreateInfo* info) { save_file_map_[info->save_id] = save_file; info->path = save_file->full_path(); - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &SaveFileManager::OnStartSave, info)); } @@ -240,12 +240,12 @@ void SaveFileManager::StartSave(SaveFileCreateInfo* info) { void SaveFileManager::UpdateSaveProgress(int save_id, net::IOBuffer* data, int data_len) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); SaveFile* save_file = LookupSaveFile(save_id); if (save_file) { bool write_success = save_file->AppendDataToFile(data->data(), data_len); - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SaveFileManager::OnUpdateSaveProgress, save_file->save_id(), save_file->bytes_so_far(), write_success)); @@ -263,12 +263,12 @@ void SaveFileManager::SaveFinished(int save_id, GURL save_url, int render_process_id, bool is_success) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); SaveFileMap::iterator it = save_file_map_.find(save_id); if (it != save_file_map_.end()) { SaveFile* save_file = it->second; - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SaveFileManager::OnSaveFinished, save_id, save_file->bytes_so_far(), is_success)); @@ -277,8 +277,8 @@ void SaveFileManager::SaveFinished(int save_id, } else if (save_id == -1) { // Before saving started, we got error. We still call finish process. DCHECK(!save_url.is_empty()); - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SaveFileManager::OnErrorFinished, save_url, render_process_id)); @@ -288,7 +288,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(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); SavePackage* save_package = GetSavePackageFromRenderIds(info->render_process_id, info->render_view_id); @@ -322,7 +322,7 @@ void SaveFileManager::OnStartSave(const SaveFileCreateInfo* info) { void SaveFileManager::OnUpdateSaveProgress(int save_id, int64 bytes_so_far, bool write_success) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); SavePackage* package = LookupPackage(save_id); if (package) package->UpdateSaveProgress(save_id, bytes_so_far, write_success); @@ -333,14 +333,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(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); SavePackage* package = LookupPackage(save_id); if (package) package->SaveFinished(save_id, bytes_so_far, is_success); } void SaveFileManager::OnErrorFinished(GURL save_url, int tab_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); SavePackage* save_package = UnregisterStartingRequest(save_url, tab_id); if (save_package) save_package->SaveFailed(save_url); @@ -354,7 +354,7 @@ void SaveFileManager::OnSaveURL( int render_process_host_id, int render_view_id, URLRequestContextGetter* request_context_getter) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); URLRequestContext* context = request_context_getter->GetURLRequestContext(); resource_dispatcher_host_->BeginSaveFile(url, referrer, @@ -365,19 +365,19 @@ void SaveFileManager::OnSaveURL( void SaveFileManager::OnRequireSaveJobFromOtherSource( SaveFileCreateInfo* info) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK_EQ(info->save_id, -1); // Generate a unique save id. info->save_id = GetNextId(); // Start real saving action. - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(this, &SaveFileManager::StartSave, info)); } void SaveFileManager::ExecuteCancelSaveRequest(int render_process_id, int request_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); resource_dispatcher_host_->CancelRequest(render_process_id, request_id, false); @@ -391,7 +391,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(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); SaveFileMap::iterator it = save_file_map_.find(save_id); if (it != save_file_map_.end()) { SaveFile* save_file = it->second; @@ -400,8 +400,8 @@ void SaveFileManager::CancelSave(int save_id) { // message to IO thread. If the data comes from other sources, just // ignore the cancel message. if (save_file->save_source() == SaveFileCreateInfo::SAVE_FILE_FROM_NET) { - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &SaveFileManager::ExecuteCancelSaveRequest, save_file->render_process_id(), save_file->request_id())); @@ -428,7 +428,7 @@ void SaveFileManager::CancelSave(int save_id) { void SaveFileManager::SaveLocalFile(const GURL& original_file_url, int save_id, int render_process_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); SaveFile* save_file = LookupSaveFile(save_id); if (!save_file) return; @@ -458,7 +458,7 @@ void SaveFileManager::SaveLocalFile(const GURL& original_file_url, void SaveFileManager::OnDeleteDirectoryOrFile(const FilePath& full_path, bool is_dir) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!full_path.empty()); file_util::Delete(full_path, is_dir); @@ -468,7 +468,7 @@ void SaveFileManager::OnDeleteDirectoryOrFile(const FilePath& full_path, // We run on this thread to avoid blocking the UI with slow Shell operations. #if !defined(OS_MACOSX) void SaveFileManager::OnShowSavedFileInShell(const FilePath full_path) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); platform_util::ShowItemInFolder(full_path); } #endif @@ -479,7 +479,7 @@ void SaveFileManager::RenameAllFiles( int render_process_id, int render_view_id, int save_package_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (!resource_dir.empty() && !file_util::PathExists(resource_dir)) file_util::CreateDirectory(resource_dir); @@ -496,8 +496,8 @@ void SaveFileManager::RenameAllFiles( } } - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SaveFileManager::OnFinishSavePageJob, render_process_id, render_view_id, save_package_id)); @@ -506,7 +506,7 @@ void SaveFileManager::RenameAllFiles( void SaveFileManager::OnFinishSavePageJob(int render_process_id, int render_view_id, int save_package_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); SavePackage* save_package = GetSavePackageFromRenderIds(render_process_id, render_view_id); @@ -517,7 +517,7 @@ void SaveFileManager::OnFinishSavePageJob(int render_process_id, void SaveFileManager::RemoveSavedFileFromFileMap( const SaveIDList& save_ids) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); for (SaveIDList::const_iterator i = save_ids.begin(); i != save_ids.end(); ++i) { diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index 4ce3e36..cb97629 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -202,13 +202,13 @@ class CreateDownloadDirectoryTask : public Task { if (!file_util::DirectoryExists(default_download_dir_)) file_util::CreateDirectory(default_download_dir_); - ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(save_package_, &SavePackage::ContinueGetSaveInfo, default_download_dir_)); } else { // If it does exist, use the default save dir param. - ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(save_package_, &SavePackage::ContinueGetSaveInfo, default_save_file_dir_)); @@ -572,8 +572,8 @@ void SavePackage::StartSave(const SaveFileCreateInfo* info) { // If the save source is from file system, inform SaveFileManager to copy // corresponding file to the file path which this SaveItem specifies. if (info->save_source == SaveFileCreateInfo::SAVE_FILE_FROM_FILE) { - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::SaveLocalFile, save_item->url(), @@ -679,8 +679,8 @@ void SavePackage::Stop() { it != saved_failed_items_.end(); ++it) save_ids.push_back(it->second->save_id()); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::RemoveSavedFileFromFileMap, save_ids)); @@ -709,8 +709,8 @@ void SavePackage::CheckFinish() { final_names.push_back(std::make_pair(it->first, it->second->full_path())); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::RenameAllFiles, final_names, @@ -736,8 +736,8 @@ void SavePackage::Finish() { it != saved_failed_items_.end(); ++it) save_ids.push_back(it->second->save_id()); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::RemoveSavedFileFromFileMap, save_ids)); @@ -836,8 +836,8 @@ void SavePackage::SaveCanceled(SaveItem* save_item) { save_item->url(), this); if (save_item->save_id() != -1) - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::CancelSave, save_item->save_id())); @@ -879,13 +879,13 @@ void SavePackage::SaveNextFile(bool process_all_remaining_items) { void SavePackage::ShowDownloadInShell() { DCHECK(file_manager_); DCHECK(finished_ && !canceled() && !saved_main_file_path_.empty()); - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); #if defined(OS_MACOSX) // Mac OS X requires opening downloads on the UI thread. platform_util::ShowItemInFolder(saved_main_file_path_); #else - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::OnShowSavedFileInShell, saved_main_file_path_)); @@ -1005,8 +1005,8 @@ void SavePackage::OnReceivedSerializedHtmlData(const GURL& frame_url, if (flag == WebPageSerializerClient::AllFramesAreFinished) { for (SaveUrlItemMap::iterator it = in_progress_items_.begin(); it != in_progress_items_.end(); ++it) { - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::SaveFinished, it->second->save_id(), @@ -1030,8 +1030,8 @@ void SavePackage::OnReceivedSerializedHtmlData(const GURL& frame_url, memcpy(new_data->data(), data.data(), data.size()); // Call write file functionality in file thread. - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::UpdateSaveProgress, save_item->save_id(), @@ -1041,8 +1041,8 @@ void SavePackage::OnReceivedSerializedHtmlData(const GURL& frame_url, // Current frame is completed saving, call finish in file thread. if (flag == WebPageSerializerClient::CurrentFrameIsFinished) { - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, NewRunnableMethod(file_manager_, &SaveFileManager::SaveFinished, save_item->save_id(), @@ -1240,8 +1240,8 @@ void SavePackage::GetSaveInfo() { FilePath download_save_dir = prefs->GetFilePath( prefs::kDownloadDefaultDirectory); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, new CreateDownloadDirectoryTask(this, website_save_dir, download_save_dir)); |