Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/chromeos/gdata/gdata_contacts_service.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/gdata/gdata_contacts_service.h"
 
 #include <cstring>
 #include <string>
 #include <map>
 #include <utility>
 
 #include "base/json/json_value_converter.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #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"
 #include "chrome/browser/chromeos/gdata/operation_runner.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace gdata {
 
@@ skipping 440 matching lines @@
   // Invokes the failure callback and notifies GDataContactsService that the
   // request is done.
   void ReportFailure() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     failure_callback_.Run();
     service_->OnRequestComplete(this);
   }
 
   // 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) {
       LOG(WARNING) << "Got error " << error << " while downloading groups";
       ReportFailure();
       return;
     }
 
     VLOG(2) << "Got groups feed data:\n"
             << PrettyPrintValue(*(feed_data.get()));
@@ skipping 26 matching lines @@
             base::Bind(&DownloadContactsRequest::HandleContactsFeedData,
                        weak_ptr_factory_.GetWeakPtr()));
     if (!service_->contacts_feed_url_for_testing_.is_empty()) {
       operation->set_feed_url_for_testing(
           service_->contacts_feed_url_for_testing_);
     }
     runner_->StartOperationWithRetry(operation);
   }
 
   // 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) {
       LOG(WARNING) << "Got error " << error << " while downloading contacts";
       ReportFailure();
       return;
     }
 
     VLOG(2) << "Got contacts feed data:\n"
             << PrettyPrintValue(*(feed_data.get()));
@@ skipping 133 matching lines @@
               base::Bind(&DownloadContactsRequest::HandlePhotoData,
                          weak_ptr_factory_.GetWeakPtr(),
                          contact)));
       num_in_progress_photo_downloads_++;
     }
   }
 
   // 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()
             << " (error=" << error << " size=" << download_data->size() << ")";
     num_in_progress_photo_downloads_--;
 
     if (error == HTTP_INTERNAL_SERVER_ERROR ||
         error == HTTP_SERVICE_UNAVAILABLE) {
       int num_errors = ++transient_photo_download_errors_per_contact_[contact];
       if (num_errors <= kMaxTransientPhotoDownloadErrorsPerContact) {
@@ skipping 112 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(request);
   VLOG(1) << "Download request " << request << " complete";
   if (!request->my_contacts_group_id().empty())
     cached_my_contacts_group_id_ = request->my_contacts_group_id();
   requests_.erase(request);
   delete request;
 }
 
 }  // namespace contacts