Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc

Index: chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc b/chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc
index 5aac75c31af6e42d066bae325944e387afa8dbcc..a19712e6cbee375ca7223c752a9d9afb5607796c 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc
@@ -50,9 +50,9 @@ class GDataTest : public InProcessBrowserTest {
 };
 
 // The test callback for GDataWapiService::DownloadFile().
-void TestDownloadCallback(gdata::GDataErrorCode* result,
+void TestDownloadCallback(gdata::DriveErrorCode* result,
                           std::string* contents,
-                          gdata::GDataErrorCode error,
+                          gdata::DriveErrorCode error,
                           const GURL& content_url,
                           const FilePath& temp_file) {
   *result = error;
@@ -62,9 +62,9 @@ void TestDownloadCallback(gdata::GDataErrorCode* result,
 }
 
 // The test callback for GDataWapiService::GetDocuments().
-void TestGetDocumentsCallback(gdata::GDataErrorCode* result_code,
+void TestGetDocumentsCallback(gdata::DriveErrorCode* result_code,
                               base::Value** result_data,
-                              gdata::GDataErrorCode error,
+                              gdata::DriveErrorCode error,
                               scoped_ptr<base::Value> feed_data) {
   *result_code = error;
   *result_data = feed_data.release();
@@ -74,7 +74,7 @@ void TestGetDocumentsCallback(gdata::GDataErrorCode* result_code,
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(GDataTest, Download) {
-  gdata::GDataErrorCode result = gdata::GDATA_OTHER_ERROR;
+  gdata::DriveErrorCode result = gdata::DRIVE_OTHER_ERROR;
   std::string contents;
   service_->DownloadFile(
       FilePath("/dummy/gdata/testfile.txt"),
@@ -93,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, Download) {
 }
 
 IN_PROC_BROWSER_TEST_F(GDataTest, NonExistingDownload) {
-  gdata::GDataErrorCode result = gdata::GDATA_OTHER_ERROR;
+  gdata::DriveErrorCode result = gdata::DRIVE_OTHER_ERROR;
   std::string dummy_contents;
   service_->DownloadFile(
       FilePath("/dummy/gdata/no-such-file.txt"),
@@ -108,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, NonExistingDownload) {
 }
 
 IN_PROC_BROWSER_TEST_F(GDataTest, GetDocuments) {
-  gdata::GDataErrorCode result = gdata::GDATA_OTHER_ERROR;
+  gdata::DriveErrorCode result = gdata::DRIVE_OTHER_ERROR;
   base::Value* result_data = NULL;
   service_->GetDocuments(
       gdata_test_server_.GetURL("files/chromeos/gdata/root_feed.json"),
@@ -133,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, GetDocuments) {
 IN_PROC_BROWSER_TEST_F(GDataTest, GetDocumentsFailure) {
   // testfile.txt exists but the response is not JSON, so it should
   // emit a parse error instead.
-  gdata::GDataErrorCode result = gdata::GDATA_OTHER_ERROR;
+  gdata::DriveErrorCode result = gdata::DRIVE_OTHER_ERROR;
   base::Value* result_data = NULL;
   service_->GetDocuments(
       gdata_test_server_.GetURL("files/chromeos/gdata/testfile.txt"),
@@ -143,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, GetDocumentsFailure) {
       base::Bind(&TestGetDocumentsCallback, &result, &result_data));
   content::RunMessageLoop();
 
-  EXPECT_EQ(gdata::GDATA_PARSE_ERROR, result);
+  EXPECT_EQ(gdata::DRIVE_PARSE_ERROR, result);
   EXPECT_FALSE(result_data);
 }