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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/drive/drive_uploader_unittest.cc

Issue 1042803002: Drive: Move inner structures of DriveAPIService under drive namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 5 years, 9 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
« no previous file with comments | « chrome/browser/drive/drive_uploader.h ('k') | chrome/browser/drive/fake_drive_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/drive/drive_uploader_unittest.cc
diff --git a/chrome/browser/drive/drive_uploader_unittest.cc b/chrome/browser/drive/drive_uploader_unittest.cc
index 0be6508594b1ff88eb14f71b1a23637e3426f53f..9efc58c532e87233c2ec3c29e0ceffcc877dee56 100644
--- a/chrome/browser/drive/drive_uploader_unittest.cc
+++ b/chrome/browser/drive/drive_uploader_unittest.cc
@@ -434,12 +434,9 @@ TEST_F(DriveUploaderTest, UploadExisting0KB) {
base::MessageLoopProxy::current().get());
std::vector<test_util::ProgressInfo> upload_progress_values;
uploader.UploadExistingFile(
- kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- DriveUploader::UploadExistingFileOptions(),
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &entry),
+ kTestInitiateUploadResourceId, local_path, kTestMimeType,
+ UploadExistingFileOptions(),
+ test_util::CreateCopyResultCallback(&error, &upload_location, &entry),
base::Bind(&test_util::AppendProgressCallbackResult,
&upload_progress_values));
base::RunLoop().RunUntilIdle();
@@ -470,12 +467,9 @@ TEST_F(DriveUploaderTest, UploadExisting512KB) {
base::MessageLoopProxy::current().get());
std::vector<test_util::ProgressInfo> upload_progress_values;
uploader.UploadExistingFile(
- kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- DriveUploader::UploadExistingFileOptions(),
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &entry),
+ kTestInitiateUploadResourceId, local_path, kTestMimeType,
+ UploadExistingFileOptions(),
+ test_util::CreateCopyResultCallback(&error, &upload_location, &entry),
base::Bind(&test_util::AppendProgressCallbackResult,
&upload_progress_values));
base::RunLoop().RunUntilIdle();
@@ -509,7 +503,7 @@ TEST_F(DriveUploaderTest, UploadExisting2MB) {
std::vector<test_util::ProgressInfo> upload_progress_values;
uploader.UploadExistingFile(
kTestInitiateUploadResourceId, local_path, kTestMimeType,
- DriveUploader::UploadExistingFileOptions(),
+ UploadExistingFileOptions(),
test_util::CreateCopyResultCallback(&error, &upload_location, &entry),
base::Bind(&test_util::AppendProgressCallbackResult,
&upload_progress_values));
@@ -543,7 +537,7 @@ TEST_F(DriveUploaderTest, InitiateUploadFail) {
base::MessageLoopProxy::current().get());
uploader.UploadExistingFile(
kTestInitiateUploadResourceId, local_path, kTestMimeType,
- DriveUploader::UploadExistingFileOptions(),
+ UploadExistingFileOptions(),
test_util::CreateCopyResultCallback(&error, &upload_location, &entry),
google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
@@ -566,13 +560,11 @@ TEST_F(DriveUploaderTest, MultipartUploadFail) {
MockDriveServiceNoConnectionAtInitiate mock_service;
DriveUploader uploader(&mock_service,
base::MessageLoopProxy::current().get());
- uploader.UploadExistingFile(kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- DriveUploader::UploadExistingFileOptions(),
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &entry),
- google_apis::ProgressCallback());
+ uploader.UploadExistingFile(
+ kTestInitiateUploadResourceId, local_path, kTestMimeType,
+ UploadExistingFileOptions(),
+ test_util::CreateCopyResultCallback(&error, &upload_location, &entry),
+ google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
EXPECT_EQ(DRIVE_NO_CONNECTION, error);
@@ -593,7 +585,7 @@ TEST_F(DriveUploaderTest, InitiateUploadNoConflict) {
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
DriveUploader uploader(&mock_service,
base::MessageLoopProxy::current().get());
- DriveUploader::UploadExistingFileOptions options;
+ UploadExistingFileOptions options;
options.etag = kTestETag;
uploader.UploadExistingFile(kTestInitiateUploadResourceId,
local_path,
@@ -622,7 +614,7 @@ TEST_F(DriveUploaderTest, MultipartUploadConflict) {
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
DriveUploader uploader(&mock_service,
base::MessageLoopProxy::current().get());
- DriveUploader::UploadExistingFileOptions options;
+ UploadExistingFileOptions options;
options.etag = kDestinationETag;
uploader.UploadExistingFile(kTestInitiateUploadResourceId,
local_path,
@@ -651,7 +643,7 @@ TEST_F(DriveUploaderTest, InitiateUploadConflict) {
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
DriveUploader uploader(&mock_service,
base::MessageLoopProxy::current().get());
- DriveUploader::UploadExistingFileOptions options;
+ UploadExistingFileOptions options;
options.etag = kDestinationETag;
uploader.UploadExistingFile(
kTestInitiateUploadResourceId, local_path, kTestMimeType, options,
@@ -676,13 +668,11 @@ TEST_F(DriveUploaderTest, ResumeUploadFail) {
MockDriveServiceNoConnectionAtResume mock_service;
DriveUploader uploader(&mock_service,
base::MessageLoopProxy::current().get());
- uploader.UploadExistingFile(kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- DriveUploader::UploadExistingFileOptions(),
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &entry),
- google_apis::ProgressCallback());
+ uploader.UploadExistingFile(
+ kTestInitiateUploadResourceId, local_path, kTestMimeType,
+ UploadExistingFileOptions(),
+ test_util::CreateCopyResultCallback(&error, &upload_location, &entry),
+ google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
EXPECT_EQ(DRIVE_NO_CONNECTION, error);
@@ -724,10 +714,8 @@ TEST_F(DriveUploaderTest, NonExistingSourceFile) {
uploader.UploadExistingFile(
kTestInitiateUploadResourceId,
temp_dir_.path().AppendASCII("_this_path_should_not_exist_"),
- kTestMimeType,
- DriveUploader::UploadExistingFileOptions(),
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &entry),
+ kTestMimeType, UploadExistingFileOptions(),
+ test_util::CreateCopyResultCallback(&error, &upload_location, &entry),
google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
« no previous file with comments | « chrome/browser/drive/drive_uploader.h ('k') | chrome/browser/drive/fake_drive_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698