Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/chromeos/gdata/gdata_contacts_service.cc

Index: chrome/browser/chromeos/gdata/gdata_contacts_service.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_contacts_service.cc b/chrome/browser/chromeos/gdata/gdata_contacts_service.cc
index b1bca7343a7f9b562aa2635ecf4d46930a6073fd..88fd3f5e259bea7e3f307c709cd93cd732e21499 100644
--- a/chrome/browser/chromeos/gdata/gdata_contacts_service.cc
+++ b/chrome/browser/chromeos/gdata/gdata_contacts_service.cc
@@ -19,6 +19,7 @@
 #include "base/timer.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
+#include "chrome/browser/chromeos/gdata/drive_errorcode.h"
 #include "chrome/browser/chromeos/gdata/gdata_operations.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/gdata/operation_registry.h"
@@ -479,7 +480,7 @@ class GDataContactsService::DownloadContactsRequest {
 
   // Callback for GetContactGroupsOperation calls.  Starts downloading the
   // actual contacts after finding the "My Contacts" group ID.
-  void HandleGroupsFeedData(GDataErrorCode error,
+  void HandleGroupsFeedData(DriveErrorCode error,

[satorux1, 2012/08/22 20:12:21]

Hmm... This does not look correct.

Contacts is nothing to deal with Drive.

I guess GDataErrorCode should be kept as before.

[Daniel Erat, 2012/08/22 20:18:41]

Yeah, I think so too. :-(

                             scoped_ptr<base::Value> feed_data) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     if (error != HTTP_SUCCESS) {
@@ -526,7 +527,7 @@ class GDataContactsService::DownloadContactsRequest {
   }
 
   // Callback for GetContactsOperation calls.
-  void HandleContactsFeedData(GDataErrorCode error,
+  void HandleContactsFeedData(DriveErrorCode error,
                               scoped_ptr<base::Value> feed_data) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     if (error != HTTP_SUCCESS) {
@@ -680,7 +681,7 @@ class GDataContactsService::DownloadContactsRequest {
   // Callback for GetContactPhotoOperation calls.  Updates the associated
   // Contact and checks for completion.
   void HandlePhotoData(contacts::Contact* contact,
-                       GDataErrorCode error,
+                       DriveErrorCode error,
                        scoped_ptr<std::string> download_data) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     VLOG(1) << "Got photo data for " << contact->contact_id()