Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: chrome/browser/chromeos/drive/file_system/copy_operation.cc

Issue 14755002: drive: Drop "Drive" from FakeDriveFileSystem and MockDriveFileSystem (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: some more cleanup Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/file_system/copy_operation.cc
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
index 584c585f7a8572652ee6f58fdd888cb7473369d4..f5a564cffa8f40f42a5cbb2c6dda5e7f665ba73c 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
@@ -75,12 +75,12 @@ struct CopyOperation::StartFileUploadParams {
CopyOperation::CopyOperation(
JobScheduler* job_scheduler,
- DriveFileSystemInterface* drive_file_system,
+ DriveFileSystemInterface* file_system,
internal::ResourceMetadata* metadata,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
OperationObserver* observer)
: job_scheduler_(job_scheduler),
- drive_file_system_(drive_file_system),
+ file_system_(file_system),
metadata_(metadata),
blocking_task_runner_(blocking_task_runner),
observer_(observer),
@@ -117,7 +117,7 @@ void CopyOperation::TransferFileFromRemoteToLocal(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- drive_file_system_->GetFileByPath(
+ file_system_->GetFileByPath(
remote_src_file_path,
base::Bind(&CopyOperation::OnGetFileCompleteForTransferFile,
weak_ptr_factory_.GetWeakPtr(),
@@ -298,7 +298,7 @@ void CopyOperation::CopyAfterGetEntryInfoPair(
// TODO(kochi): Reimplement this once the server API supports
// copying of regular files directly on the server side. crbug.com/138273
const base::FilePath& src_file_path = result->first.path;
- drive_file_system_->GetFileByPath(
+ file_system_->GetFileByPath(
src_file_path,
base::Bind(&CopyOperation::OnGetFileCompleteForCopy,
weak_ptr_factory_.GetWeakPtr(),
@@ -380,9 +380,9 @@ void CopyOperation::OnTransferCompleted(
DCHECK(!callback.is_null());
if (error == google_apis::HTTP_SUCCESS && resource_entry.get()) {
- drive_file_system_->AddUploadedFile(resource_entry.Pass(),
- file_path,
- callback);
+ file_system_->AddUploadedFile(resource_entry.Pass(),
+ file_path,
+ callback);
} else {
callback.Run(util::GDataToFileError(error));
}

Powered by Google App Engine
This is Rietveld 408576698