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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 881403003: Rename gdata_errorcode.h to drive_api_error_codes.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typos in BUILD.gn Created 5 years, 11 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
« chrome/browser/drive/drive_uploader.cc ('K') | « chrome/browser/drive/drive_uploader.cc ('k') | chrome/browser/drive/fake_drive_service.h » ('j') | chrome/browser/drive/fake_drive_service.cc » ('J')
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 385d2487071163e5f2c96ab321997e49bad5f822..0be6508594b1ff88eb14f71b1a23637e3426f53f 100644
--- a/chrome/browser/drive/drive_uploader_unittest.cc
+++ b/chrome/browser/drive/drive_uploader_unittest.cc
@@ -20,9 +20,9 @@
using google_apis::CancelCallback;
using google_apis::FileResource;
-using google_apis::GDataErrorCode;
-using google_apis::GDATA_NO_CONNECTION;
-using google_apis::GDATA_OTHER_ERROR;
+using google_apis::DriveApiErrorCode;
mtomasz 2015/01/29 06:18:02 nit: ditto
+using google_apis::DRIVE_NO_CONNECTION;
+using google_apis::DRIVE_OTHER_ERROR;
using google_apis::HTTP_CONFLICT;
using google_apis::HTTP_CREATED;
using google_apis::HTTP_NOT_FOUND;
@@ -184,7 +184,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
UploadRangeResponse response;
scoped_ptr<FileResource> entry;
if (received_bytes_ == expected_content_length_) {
- GDataErrorCode response_code =
+ DriveApiErrorCode response_code =
upload_location == GURL(kTestUploadNewFileURL) ?
HTTP_CREATED : HTTP_SUCCESS;
response = UploadRangeResponse(response_code, -1, -1);
@@ -245,7 +245,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
}
CancelCallback SendMultipartUploadResult(
- GDataErrorCode response_code,
+ DriveApiErrorCode response_code,
int64 content_length,
const google_apis::FileResourceCallback& callback,
const google_apis::ProgressCallback& progress_callback) {
@@ -289,7 +289,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
const UploadNewFileOptions& options,
const InitiateUploadCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
- base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
+ base::Bind(callback, DRIVE_NO_CONNECTION, GURL()));
return CancelCallback();
}
@@ -300,7 +300,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
const UploadExistingFileOptions& options,
const InitiateUploadCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
- base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
+ base::Bind(callback, DRIVE_NO_CONNECTION, GURL()));
return CancelCallback();
}
@@ -329,7 +329,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
const google_apis::ProgressCallback& progress_callback) override {
base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback, GDATA_NO_CONNECTION,
+ base::Bind(callback, DRIVE_NO_CONNECTION,
base::Passed(make_scoped_ptr<FileResource>(NULL))));
return CancelCallback();
}
@@ -344,7 +344,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
const google_apis::ProgressCallback& progress_callback) override {
base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback, GDATA_NO_CONNECTION,
+ base::Bind(callback, DRIVE_NO_CONNECTION,
base::Passed(make_scoped_ptr<FileResource>(NULL))));
return CancelCallback();
}
@@ -388,7 +388,7 @@ class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
const ProgressCallback& progress_callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback,
- UploadRangeResponse(GDATA_NO_CONNECTION, -1, -1),
+ UploadRangeResponse(DRIVE_NO_CONNECTION, -1, -1),
base::Passed(scoped_ptr<FileResource>())));
return CancelCallback();
}
@@ -402,7 +402,7 @@ class MockDriveServiceNoConnectionAtGetUploadStatus : public DummyDriveService {
const UploadRangeCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback,
- UploadRangeResponse(GDATA_NO_CONNECTION, -1, -1),
+ UploadRangeResponse(DRIVE_NO_CONNECTION, -1, -1),
base::Passed(scoped_ptr<FileResource>())));
return CancelCallback();
}
@@ -425,7 +425,7 @@ TEST_F(DriveUploaderTest, UploadExisting0KB) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 0, &local_path, &data));
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -461,7 +461,7 @@ TEST_F(DriveUploaderTest, UploadExisting512KB) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 512 * 1024, &local_path, &data));
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -499,7 +499,7 @@ TEST_F(DriveUploaderTest, UploadExisting2MB) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 2 * 1024 * 1024, &local_path, &data));
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -534,7 +534,7 @@ TEST_F(DriveUploaderTest, InitiateUploadFail) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 2 * 1024 * 1024, &local_path, &data));
- GDataErrorCode error = HTTP_SUCCESS;
+ DriveApiErrorCode error = HTTP_SUCCESS;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -548,7 +548,7 @@ TEST_F(DriveUploaderTest, InitiateUploadFail) {
google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
- EXPECT_EQ(GDATA_NO_CONNECTION, error);
+ EXPECT_EQ(DRIVE_NO_CONNECTION, error);
EXPECT_TRUE(upload_location.is_empty());
EXPECT_FALSE(entry);
}
@@ -559,7 +559,7 @@ TEST_F(DriveUploaderTest, MultipartUploadFail) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(temp_dir_.path(), 512 * 1024,
&local_path, &data));
- GDataErrorCode error = HTTP_SUCCESS;
+ DriveApiErrorCode error = HTTP_SUCCESS;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -575,7 +575,7 @@ TEST_F(DriveUploaderTest, MultipartUploadFail) {
google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
- EXPECT_EQ(GDATA_NO_CONNECTION, error);
+ EXPECT_EQ(DRIVE_NO_CONNECTION, error);
EXPECT_TRUE(upload_location.is_empty());
EXPECT_FALSE(entry);
}
@@ -586,7 +586,7 @@ TEST_F(DriveUploaderTest, InitiateUploadNoConflict) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 512 * 1024, &local_path, &data));
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -615,7 +615,7 @@ TEST_F(DriveUploaderTest, MultipartUploadConflict) {
temp_dir_.path(), 512 * 1024, &local_path, &data));
const std::string kDestinationETag("destination_etag");
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -644,7 +644,7 @@ TEST_F(DriveUploaderTest, InitiateUploadConflict) {
temp_dir_.path(), 2 * 1024 * 1024, &local_path, &data));
const std::string kDestinationETag("destination_etag");
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -669,7 +669,7 @@ TEST_F(DriveUploaderTest, ResumeUploadFail) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 2 * 1024 * 1024, &local_path, &data));
- GDataErrorCode error = HTTP_SUCCESS;
+ DriveApiErrorCode error = HTTP_SUCCESS;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -685,7 +685,7 @@ TEST_F(DriveUploaderTest, ResumeUploadFail) {
google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
- EXPECT_EQ(GDATA_NO_CONNECTION, error);
+ EXPECT_EQ(DRIVE_NO_CONNECTION, error);
EXPECT_EQ(GURL(kTestUploadExistingFileURL), upload_location);
}
@@ -695,7 +695,7 @@ TEST_F(DriveUploaderTest, GetUploadStatusFail) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 2 * 1024 * 1024, &local_path, &data));
- GDataErrorCode error = HTTP_SUCCESS;
+ DriveApiErrorCode error = HTTP_SUCCESS;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -710,12 +710,12 @@ TEST_F(DriveUploaderTest, GetUploadStatusFail) {
google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
- EXPECT_EQ(GDATA_NO_CONNECTION, error);
+ EXPECT_EQ(DRIVE_NO_CONNECTION, error);
EXPECT_TRUE(upload_location.is_empty());
}
TEST_F(DriveUploaderTest, NonExistingSourceFile) {
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
@@ -742,7 +742,7 @@ TEST_F(DriveUploaderTest, ResumeUpload) {
ASSERT_TRUE(test_util::CreateFileOfSpecifiedSize(
temp_dir_.path(), 1024 * 1024, &local_path, &data));
- GDataErrorCode error = GDATA_OTHER_ERROR;
+ DriveApiErrorCode error = DRIVE_OTHER_ERROR;
GURL upload_location;
scoped_ptr<FileResource> entry;
« chrome/browser/drive/drive_uploader.cc ('K') | « chrome/browser/drive/drive_uploader.cc ('k') | chrome/browser/drive/fake_drive_service.h » ('j') | chrome/browser/drive/fake_drive_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698