Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.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 <utility>
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
 #include "chrome/browser/chromeos/gdata/drive_files.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h"
@@ skipping 12 matching lines @@
 }
 
 GDataWapiFeedProcessor::GDataWapiFeedProcessor(
     DriveResourceMetadata* resource_metadata)
   : resource_metadata_(resource_metadata) {
 }
 
 GDataWapiFeedProcessor::~GDataWapiFeedProcessor() {
 }
 
-GDataFileError GDataWapiFeedProcessor::ApplyFeeds(
+DriveFileError GDataWapiFeedProcessor::ApplyFeeds(
     const std::vector<DocumentFeed*>& feed_list,
     int64 start_changestamp,
     int64 root_feed_changestamp,
     std::set<FilePath>* changed_dirs) {
   bool is_delta_feed = start_changestamp != 0;
 
   resource_metadata_->set_origin(FROM_SERVER);
 
   int64 delta_feed_changestamp = 0;
   FeedToFileResourceMapUmaStats uma_stats;
   FileResourceIdMap file_map;
-  GDataFileError error = FeedToFileResourceMap(feed_list,
+  DriveFileError error = FeedToFileResourceMap(feed_list,
                                                &file_map,
                                                &delta_feed_changestamp,
                                                &uma_stats);
-  if (error != GDATA_FILE_OK)
+  if (error != DRIVE_FILE_OK)
     return error;
 
   ApplyFeedFromFileUrlMap(
       is_delta_feed,
       is_delta_feed ? delta_feed_changestamp : root_feed_changestamp,
       &file_map,
       changed_dirs);
 
   // Shouldn't record histograms when processing delta feeds.
   if (!is_delta_feed)
     UpdateFileCountUmaHistograms(uma_stats);
 
-  return GDATA_FILE_OK;
+  return DRIVE_FILE_OK;
 }
 
 void GDataWapiFeedProcessor::UpdateFileCountUmaHistograms(
     const FeedToFileResourceMapUmaStats& uma_stats) const {
   const int num_total_files =
       uma_stats.num_hosted_documents + uma_stats.num_regular_files;
   UMA_HISTOGRAM_COUNTS("GData.NumberOfRegularFiles",
                        uma_stats.num_regular_files);
   UMA_HISTOGRAM_COUNTS("GData.NumberOfHostedDocuments",
                        uma_stats.num_hosted_documents);
@@ skipping 159 matching lines @@
                  << " in file_map " << parent_id;
       } else {
         DVLOG(1) << "Adding orphan " << new_entry->GetFilePath().value();
         dir = orphaned_resources->root();
       }
     }
   }
   return dir;
 }
 
-GDataFileError GDataWapiFeedProcessor::FeedToFileResourceMap(
+DriveFileError GDataWapiFeedProcessor::FeedToFileResourceMap(
     const std::vector<DocumentFeed*>& feed_list,
     FileResourceIdMap* file_map,
     int64* feed_changestamp,
     FeedToFileResourceMapUmaStats* uma_stats) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(uma_stats);
 
-  GDataFileError error = GDATA_FILE_OK;
+  DriveFileError error = DRIVE_FILE_OK;
   uma_stats->num_regular_files = 0;
   uma_stats->num_hosted_documents = 0;
   uma_stats->num_files_with_entry_kind.clear();
   for (size_t i = 0; i < feed_list.size(); ++i) {
     const DocumentFeed* feed = feed_list[i];
 
     // Get upload url from the root feed. Links for all other collections will
     // be handled in GDatadirectory::FromDocumentEntry();
     if (i == 0) {
       const Link* root_feed_upload_link =
@@ skipping 34 matching lines @@
                      << map_entry->second->base_name();
 
         delete map_entry->second;
         file_map->erase(map_entry);
       }
       file_map->insert(
           std::pair<std::string, DriveEntry*>(entry->resource_id(), entry));
     }
   }
 
-  if (error != GDATA_FILE_OK) {
+  if (error != DRIVE_FILE_OK) {
     // If the code above fails to parse a feed, any DriveEntry instance
     // added to |file_by_url| is not managed by a DriveDirectory instance,
     // so we need to explicitly release them here.
     STLDeleteValues(file_map);
   }
 
   return error;
 }
 
 }  // namespace gdata