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

Unified Diff: chrome/browser/google_apis/gdata_wapi_operations_unittest.cc

Issue 12235002: Add GetUploadStatus method to the DriveServiceInterface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 10 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/google_apis/gdata_wapi_operations_unittest.cc
diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
index e9dc6b3d119e6d12e5d35c65787b3f7bd3a51644..26397d9d35e9337fefcb1fa5c76aa04e66845132 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
@@ -47,10 +47,10 @@ void CopyResultFromInitiateUploadCallbackAndQuit(
}
// Copies the result from ResumeUploadCallback and quit the message loop.
-void CopyResultFromResumeUploadCallbackAndQuit(
- ResumeUploadResponse* out_response,
+void CopyResultFromUploadRangeCallbackAndQuit(
+ UploadRangeResponse* out_response,
scoped_ptr<ResourceEntry>* out_new_entry,
- const ResumeUploadResponse& response,
+ const UploadRangeResponse& response,
scoped_ptr<ResourceEntry> new_entry) {
*out_response = response;
*out_new_entry = new_entry.Pass();
@@ -828,13 +828,13 @@ TEST_F(GDataWapiOperationsTest, UploadNewFile) {
upload_url,
FilePath::FromUTF8Unsafe("drive/newfile.txt"));
- ResumeUploadResponse response;
+ UploadRangeResponse response;
scoped_ptr<ResourceEntry> new_entry;
ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
&operation_registry_,
request_context_getter_.get(),
- base::Bind(&CopyResultFromResumeUploadCallbackAndQuit,
+ base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
&response,
&new_entry),
resume_params);
@@ -943,13 +943,13 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
upload_url,
FilePath::FromUTF8Unsafe("drive/newfile.txt"));
- ResumeUploadResponse response;
+ UploadRangeResponse response;
scoped_ptr<ResourceEntry> new_entry;
ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
&operation_registry_,
request_context_getter_.get(),
- base::Bind(&CopyResultFromResumeUploadCallbackAndQuit,
+ base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
&response,
&new_entry),
resume_params);
@@ -1057,13 +1057,13 @@ TEST_F(GDataWapiOperationsTest, UploadNewEmptyFile) {
upload_url,
FilePath::FromUTF8Unsafe("drive/newfile.txt"));
- ResumeUploadResponse response;
+ UploadRangeResponse response;
scoped_ptr<ResourceEntry> new_entry;
ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
&operation_registry_,
request_context_getter_.get(),
- base::Bind(&CopyResultFromResumeUploadCallbackAndQuit,
+ base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
&response,
&new_entry),
resume_params);
@@ -1154,13 +1154,13 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFile) {
upload_url,
FilePath::FromUTF8Unsafe("drive/existingfile.txt"));
- ResumeUploadResponse response;
+ UploadRangeResponse response;
scoped_ptr<ResourceEntry> new_entry;
ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
&operation_registry_,
request_context_getter_.get(),
- base::Bind(&CopyResultFromResumeUploadCallbackAndQuit,
+ base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
&response,
&new_entry),
resume_params);
@@ -1253,13 +1253,13 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFileWithETag) {
upload_url,
FilePath::FromUTF8Unsafe("drive/existingfile.txt"));
- ResumeUploadResponse response;
+ UploadRangeResponse response;
scoped_ptr<ResourceEntry> new_entry;
ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
&operation_registry_,
request_context_getter_.get(),
- base::Bind(&CopyResultFromResumeUploadCallbackAndQuit,
+ base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
&response,
&new_entry),
resume_params);
« no previous file with comments | « chrome/browser/google_apis/gdata_wapi_operations.cc ('k') | chrome/browser/google_apis/gdata_wapi_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698