Rename gdata_errorcode.h to drive_api_error_codes.h

google_apis/drive/drive_api_requests_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 33 matching lines @@
     "\"id\": \"resource_id\",\n"
     "\"selfLink\": \"self_link\",\n"
     "}\n";
 
 const char kTestUploadExistingFilePath[] = "/upload/existingfile/path";
 const char kTestUploadNewFilePath[] = "/upload/newfile/path";
 const char kTestDownloadPathPrefix[] = "/download/";
 
 // Used as a GetContentCallback.
 void AppendContent(std::string* out,
-                   GDataErrorCode error,
+                   DriveApiErrorCode error,
                    scoped_ptr<std::string> content) {
   EXPECT_EQ(HTTP_SUCCESS, error);
   out->append(*content);
 }
 
 }  // namespace
 
 class DriveApiRequestsTest : public testing::Test {
  public:
   DriveApiRequestsTest() {
@@ skipping 318 matching lines @@
 };
 
 TEST_F(DriveApiRequestsTest, DriveApiDataRequest_Fields) {
   // Make sure that "fields" query param is supported by using its subclass,
   // AboutGetRequest.
 
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/about.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<AboutResource> about_resource;
 
   {
     base::RunLoop run_loop;
     drive::AboutGetRequest* request = new drive::AboutGetRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &about_resource)));
@@ skipping 22 matching lines @@
 
 TEST_F(DriveApiRequestsTest, FilesInsertRequest) {
   const base::Time::Exploded kModifiedDate = {2012, 7, 0, 19, 15, 59, 13, 123};
   const base::Time::Exploded kLastViewedByMeDate =
       {2013, 7, 0, 19, 15, 59, 13, 123};
 
   // Set an expected data file containing the directory's entry data.
   expected_data_file_path_ =
       test_util::GetTestFilePath("drive/directory_entry.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> file_resource;
 
   // Create "new directory" in the root directory.
   {
     base::RunLoop run_loop;
     drive::FilesInsertRequest* request = new drive::FilesInsertRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
@@ skipping 36 matching lines @@
 
 TEST_F(DriveApiRequestsTest, FilesPatchRequest) {
   const base::Time::Exploded kModifiedDate = {2012, 7, 0, 19, 15, 59, 13, 123};
   const base::Time::Exploded kLastViewedByMeDate =
       {2013, 7, 0, 19, 15, 59, 13, 123};
 
   // Set an expected data file containing valid result.
   expected_data_file_path_ =
       test_util::GetTestFilePath("drive/file_entry.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> file_resource;
 
   {
     base::RunLoop run_loop;
     drive::FilesPatchRequest* request = new drive::FilesPatchRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &file_resource)));
@@ skipping 25 matching lines @@
             "\"title\":\"new title\"}",
             http_request_.content);
   EXPECT_TRUE(file_resource);
 }
 
 TEST_F(DriveApiRequestsTest, AboutGetRequest_ValidJson) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/about.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<AboutResource> about_resource;
 
   {
     base::RunLoop run_loop;
     drive::AboutGetRequest* request = new drive::AboutGetRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &about_resource)));
@@ skipping 13 matching lines @@
   EXPECT_EQ(expected->quota_bytes_total(), about_resource->quota_bytes_total());
   EXPECT_EQ(expected->quota_bytes_used(), about_resource->quota_bytes_used());
   EXPECT_EQ(expected->root_folder_id(), about_resource->root_folder_id());
 }
 
 TEST_F(DriveApiRequestsTest, AboutGetRequest_InvalidJson) {
   // Set an expected data file containing invalid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/testfile.txt");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<AboutResource> about_resource;
 
   {
     base::RunLoop run_loop;
     drive::AboutGetRequest* request = new drive::AboutGetRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &about_resource)));
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   // "parse error" should be returned, and the about resource should be NULL.
-  EXPECT_EQ(GDATA_PARSE_ERROR, error);
+  EXPECT_EQ(DRIVE_PARSE_ERROR, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/about", http_request_.relative_url);
   EXPECT_FALSE(about_resource);
 }
 
 TEST_F(DriveApiRequestsTest, AppsListRequest) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/applist.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<AppList> app_list;
 
   {
     base::RunLoop run_loop;
     drive::AppsListRequest* request = new drive::AppsListRequest(
         request_sender_.get(),
         *url_generator_,
         false,  // use_internal_endpoint
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &app_list)));
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/apps", http_request_.relative_url);
   EXPECT_TRUE(app_list);
 }
 
 TEST_F(DriveApiRequestsTest, ChangesListRequest) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/changelist.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<ChangeList> result;
 
   {
     base::RunLoop run_loop;
     drive::ChangesListRequest* request = new drive::ChangesListRequest(
         request_sender_.get(), *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &result)));
     request->set_include_deleted(true);
     request->set_start_change_id(100);
     request->set_max_results(500);
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/changes?maxResults=500&startChangeId=100",
             http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiRequestsTest, ChangesListNextPageRequest) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/changelist.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<ChangeList> result;
 
   {
     base::RunLoop run_loop;
     drive::ChangesListNextPageRequest* request =
         new drive::ChangesListNextPageRequest(
             request_sender_.get(),
             test_util::CreateQuitCallback(
                 &run_loop,
                 test_util::CreateCopyResultCallback(&error, &result)));
     request->set_next_link(test_server_.GetURL("/continue/get/change/list"));
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/continue/get/change/list", http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiRequestsTest, FilesCopyRequest) {
   const base::Time::Exploded kModifiedDate = {2012, 7, 0, 19, 15, 59, 13, 123};
 
   // Set an expected data file containing the dummy file entry data.
   // It'd be returned if we copy a file.
   expected_data_file_path_ =
       test_util::GetTestFilePath("drive/file_entry.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> file_resource;
 
   // Copy the file to a new file named "new title".
   {
     base::RunLoop run_loop;
     drive::FilesCopyRequest* request = new drive::FilesCopyRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
@@ skipping 18 matching lines @@
       http_request_.content);
   EXPECT_TRUE(file_resource);
 }
 
 TEST_F(DriveApiRequestsTest, FilesCopyRequest_EmptyParentResourceId) {
   // Set an expected data file containing the dummy file entry data.
   // It'd be returned if we copy a file.
   expected_data_file_path_ =
       test_util::GetTestFilePath("drive/file_entry.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> file_resource;
 
   // Copy the file to a new file named "new title".
   {
     base::RunLoop run_loop;
     drive::FilesCopyRequest* request = new drive::FilesCopyRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
@@ skipping 12 matching lines @@
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_EQ("{\"title\":\"new title\"}", http_request_.content);
   EXPECT_TRUE(file_resource);
 }
 
 TEST_F(DriveApiRequestsTest, FilesListRequest) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/filelist.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<FileList> result;
 
   {
     base::RunLoop run_loop;
     drive::FilesListRequest* request = new drive::FilesListRequest(
         request_sender_.get(), *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &result)));
     request->set_max_results(50);
     request->set_q("\"abcde\" in parents");
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/files?maxResults=50&q=%22abcde%22+in+parents",
             http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiRequestsTest, FilesListNextPageRequest) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "drive/filelist.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<FileList> result;
 
   {
     base::RunLoop run_loop;
     drive::FilesListNextPageRequest* request =
         new drive::FilesListNextPageRequest(
             request_sender_.get(),
             test_util::CreateQuitCallback(
                 &run_loop,
                 test_util::CreateCopyResultCallback(&error, &result)));
     request->set_next_link(test_server_.GetURL("/continue/get/file/list"));
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/continue/get/file/list", http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiRequestsTest, FilesDeleteRequest) {
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
 
   // Delete a resource with the given resource id.
   {
     base::RunLoop run_loop;
     drive::FilesDeleteRequest* request = new drive::FilesDeleteRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop, test_util::CreateCopyResultCallback(&error)));
     request->set_file_id("resource_id");
     request->set_etag(kTestETag);
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_NO_CONTENT, error);
   EXPECT_EQ(net::test_server::METHOD_DELETE, http_request_.method);
   EXPECT_EQ(kTestETag, http_request_.headers["If-Match"]);
   EXPECT_EQ("/drive/v2/files/resource_id", http_request_.relative_url);
   EXPECT_FALSE(http_request_.has_content);
 }
 
 TEST_F(DriveApiRequestsTest, FilesTrashRequest) {
   // Set data for the expected result. Directory entry should be returned
   // if the trashing entry is a directory, so using it here should be fine.
   expected_data_file_path_ =
       test_util::GetTestFilePath("drive/directory_entry.json");
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> file_resource;
 
   // Trash a resource with the given resource id.
   {
     base::RunLoop run_loop;
     drive::FilesTrashRequest* request = new drive::FilesTrashRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error, &file_resource)));
     request->set_file_id("resource_id");
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/drive/v2/files/resource_id/trash", http_request_.relative_url);
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_TRUE(http_request_.content.empty());
 }
 
 TEST_F(DriveApiRequestsTest, ChildrenInsertRequest) {
   // Set an expected data file containing the children entry.
   expected_content_type_ = "application/json";
   expected_content_ = kTestChildrenResponse;
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
 
   // Add a resource with "resource_id" to a directory with
   // "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::ChildrenInsertRequest* request = new drive::ChildrenInsertRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&error)));
     request->set_folder_id("parent_resource_id");
     request->set_id("resource_id");
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/drive/v2/files/parent_resource_id/children",
             http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_EQ("{\"id\":\"resource_id\"}", http_request_.content);
 }
 
 TEST_F(DriveApiRequestsTest, ChildrenDeleteRequest) {
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
 
   // Remove a resource with "resource_id" from a directory with
   // "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::ChildrenDeleteRequest* request = new drive::ChildrenDeleteRequest(
         request_sender_.get(),
         *url_generator_,
         test_util::CreateQuitCallback(
             &run_loop,
@@ skipping 14 matching lines @@
 TEST_F(DriveApiRequestsTest, UploadNewFileRequest) {
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadNewFilePath;
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("upload_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with
   // "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadNewFileRequest* request =
         new drive::InitiateUploadNewFileRequest(
             request_sender_.get(),
             *url_generator_,
@@ skipping 72 matching lines @@
 TEST_F(DriveApiRequestsTest, UploadNewEmptyFileRequest) {
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadNewFilePath;
 
   const char kTestContentType[] = "text/plain";
   const char kTestContent[] = "";
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("empty_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadNewFileRequest* request =
         new drive::InitiateUploadNewFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 68 matching lines @@
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadNewFilePath;
 
   const char kTestContentType[] = "text/plain";
   const size_t kNumChunkBytes = 10;  // Num bytes in a chunk.
   const std::string kTestContent(100, 'a');
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("upload_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadNewFileRequest* request =
         new drive::InitiateUploadNewFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 158 matching lines @@
   const base::Time::Exploded kModifiedDate = {2012, 7, 0, 19, 15, 59, 13, 123};
   const base::Time::Exploded kLastViewedByMeDate =
       {2013, 7, 0, 19, 15, 59, 13, 123};
 
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadNewFilePath;
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadNewFileRequest* request =
         new drive::InitiateUploadNewFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 32 matching lines @@
 TEST_F(DriveApiRequestsTest, UploadExistingFileRequest) {
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadExistingFilePath;
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("upload_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadExistingFileRequest* request =
         new drive::InitiateUploadExistingFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 66 matching lines @@
 TEST_F(DriveApiRequestsTest, UploadExistingFileRequestWithETag) {
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadExistingFilePath;
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("upload_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadExistingFileRequest* request =
         new drive::InitiateUploadExistingFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 68 matching lines @@
   expected_upload_path_ = kTestUploadExistingFilePath;
 
   // If it turned out that the etag is conflicting, PRECONDITION_FAILED should
   // be returned.
   expected_precondition_failed_file_path_ =
       test_util::GetTestFilePath("drive/error.json");
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadExistingFileRequest* request =
         new drive::InitiateUploadExistingFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 24 matching lines @@
        UploadExistingFileRequestWithETagConflictOnResumeUpload) {
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadExistingFilePath;
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("upload_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadExistingFileRequest* request =
         new drive::InitiateUploadExistingFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 75 matching lines @@
   const base::Time::Exploded kModifiedDate = {2012, 7, 0, 19, 15, 59, 13, 123};
   const base::Time::Exploded kLastViewedByMeDate =
       {2013, 7, 0, 19, 15, 59, 13, 123};
 
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadExistingFilePath;
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   {
     base::RunLoop run_loop;
     drive::InitiateUploadExistingFileRequest* request =
         new drive::InitiateUploadExistingFileRequest(
             request_sender_.get(),
             *url_generator_,
             kTestContentType,
@@ skipping 32 matching lines @@
             "\"kind\":\"drive#fileLink\"}],"
             "\"title\":\"new file title\"}",
             http_request_.content);
 }
 
 TEST_F(DriveApiRequestsTest, DownloadFileRequest) {
   const base::FilePath kDownloadedFilePath =
       temp_dir_.path().AppendASCII("cache_file");
   const std::string kTestId("dummyId");
 
-  GDataErrorCode result_code = GDATA_OTHER_ERROR;
+  DriveApiErrorCode result_code = DRIVE_OTHER_ERROR;
   base::FilePath temp_file;
   {
     base::RunLoop run_loop;
     drive::DownloadFileRequest* request = new drive::DownloadFileRequest(
         request_sender_.get(),
         *url_generator_,
         kTestId,
         kDownloadedFilePath,
         test_util::CreateQuitCallback(
             &run_loop,
@@ skipping 15 matching lines @@
 
   const std::string expected_contents = kTestId + kTestId + kTestId;
   EXPECT_EQ(expected_contents, contents);
 }
 
 TEST_F(DriveApiRequestsTest, DownloadFileRequest_GetContentCallback) {
   const base::FilePath kDownloadedFilePath =
       temp_dir_.path().AppendASCII("cache_file");
   const std::string kTestId("dummyId");
 
-  GDataErrorCode result_code = GDATA_OTHER_ERROR;
+  DriveApiErrorCode result_code = DRIVE_OTHER_ERROR;
   base::FilePath temp_file;
   std::string contents;
   {
     base::RunLoop run_loop;
     drive::DownloadFileRequest* request = new drive::DownloadFileRequest(
         request_sender_.get(),
         *url_generator_,
         kTestId,
         kDownloadedFilePath,
         test_util::CreateQuitCallback(
@@ skipping 13 matching lines @@
   EXPECT_EQ(kDownloadedFilePath, temp_file);
 
   const std::string expected_contents = kTestId + kTestId + kTestId;
   EXPECT_EQ(expected_contents, contents);
 }
 
 TEST_F(DriveApiRequestsTest, PermissionsInsertRequest) {
   expected_content_type_ = "application/json";
   expected_content_ = kTestPermissionResponse;
 
-  GDataErrorCode error = GDATA_OTHER_ERROR;
+  DriveApiErrorCode error = DRIVE_OTHER_ERROR;
 
   // Add comment permission to the user "user@example.com".
   {
     base::RunLoop run_loop;
     drive::PermissionsInsertRequest* request =
         new drive::PermissionsInsertRequest(
             request_sender_.get(),
             *url_generator_,
             test_util::CreateQuitCallback(
                 &run_loop,
@@ skipping 15 matching lines @@
   scoped_ptr<base::Value> expected(base::JSONReader::Read(
       "{\"additionalRoles\":[\"commenter\"], \"role\":\"reader\", "
       "\"type\":\"user\",\"value\":\"user@example.com\"}"));
   ASSERT_TRUE(expected);
 
   scoped_ptr<base::Value> result(base::JSONReader::Read(http_request_.content));
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_TRUE(base::Value::Equals(expected.get(), result.get()));
 
   // Add "can edit" permission to users in "example.com".
-  error = GDATA_OTHER_ERROR;
+  error = DRIVE_OTHER_ERROR;
   {
     base::RunLoop run_loop;
     drive::PermissionsInsertRequest* request =
         new drive::PermissionsInsertRequest(
             request_sender_.get(),
             *url_generator_,
             test_util::CreateQuitCallback(
                 &run_loop,
                 test_util::CreateCopyResultCallback(&error)));
     request->set_id("resource_id2");
@@ skipping 13 matching lines @@
   expected.reset(base::JSONReader::Read(
       "{\"role\":\"writer\", \"type\":\"domain\",\"value\":\"example.com\"}"));
   ASSERT_TRUE(expected);
 
   result.reset(base::JSONReader::Read(http_request_.content));
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_TRUE(base::Value::Equals(expected.get(), result.get()));
 }
 
 }  // namespace google_apis