diff options
Diffstat (limited to 'chrome/browser/chromeos/drive/file_system/copy_operation.cc')
| -rw-r--r-- | chrome/browser/chromeos/drive/file_system/copy_operation.cc | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc index 39b959a..e6b58f1 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc @@ -17,11 +17,8 @@ #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/drive/drive_api_util.h" -#include "content/public/browser/browser_thread.h" #include "google_apis/drive/drive_api_parser.h" -using content::BrowserThread; - namespace drive { namespace file_system { @@ -288,18 +285,17 @@ CopyOperation::CopyOperation(base::SequencedTaskRunner* blocking_task_runner, delegate, metadata)), weak_ptr_factory_(this) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); } CopyOperation::~CopyOperation() { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); } void CopyOperation::Copy(const base::FilePath& src_file_path, const base::FilePath& dest_file_path, bool preserve_last_modified, const FileOperationCallback& callback) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); CopyParams* params = new CopyParams; @@ -328,7 +324,7 @@ void CopyOperation::CopyAfterTryToCopyLocally( const bool* directory_changed, const bool* should_copy_on_server, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!params->callback.is_null()); for (const auto& id : *updated_local_ids) { @@ -366,7 +362,7 @@ void CopyOperation::CopyAfterTryToCopyLocally( void CopyOperation::CopyAfterParentSync(const CopyParams& params, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!params.callback.is_null()); if (error != FILE_ERROR_OK) { @@ -391,7 +387,7 @@ void CopyOperation::CopyAfterParentSync(const CopyParams& params, void CopyOperation::CopyAfterGetParentResourceId(const CopyParams& params, const ResourceEntry* parent, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!params.callback.is_null()); if (error != FILE_ERROR_OK) { @@ -420,7 +416,7 @@ void CopyOperation::TransferFileFromLocalToRemote( const base::FilePath& local_src_path, const base::FilePath& remote_dest_path, const FileOperationCallback& callback) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); std::string* gdoc_resource_id = new std::string; @@ -446,7 +442,7 @@ void CopyOperation::TransferFileFromLocalToRemoteAfterPrepare( std::string* gdoc_resource_id, ResourceEntry* parent_entry, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); if (error != FILE_ERROR_OK) { @@ -483,7 +479,7 @@ void CopyOperation::TransferFileFromLocalToRemoteAfterPrepare( void CopyOperation::TransferJsonGdocFileAfterLocalWork( TransferJsonGdocParams* params, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); if (error != FILE_ERROR_OK) { params->callback.Run(error); @@ -541,7 +537,7 @@ void CopyOperation::CopyResourceOnServer( const std::string& new_title, const base::Time& last_modified, const FileOperationCallback& callback) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); scheduler_->CopyResource( @@ -555,7 +551,7 @@ void CopyOperation::UpdateAfterServerSideOperation( const FileOperationCallback& callback, google_apis::DriveApiErrorCode status, scoped_ptr<google_apis::FileResource> entry) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); FileError error = GDataToFileError(status); @@ -589,7 +585,7 @@ void CopyOperation::UpdateAfterLocalStateUpdate( base::FilePath* file_path, const ResourceEntry* entry, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); if (error == FILE_ERROR_OK) { @@ -604,7 +600,7 @@ void CopyOperation::ScheduleTransferRegularFile( const base::FilePath& local_src_path, const base::FilePath& remote_dest_path, const FileOperationCallback& callback) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); create_file_operation_->CreateFile( @@ -621,7 +617,7 @@ void CopyOperation::ScheduleTransferRegularFileAfterCreate( const base::FilePath& remote_dest_path, const FileOperationCallback& callback, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); if (error != FILE_ERROR_OK) { @@ -656,7 +652,7 @@ void CopyOperation::ScheduleTransferRegularFileAfterUpdateLocalState( const ResourceEntry* entry, std::string* local_id, FileError error) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!callback.is_null()); if (error == FILE_ERROR_OK) { |