Rename GDataCache* to DriveCache*

chrome/browser/chromeos/gdata/gdata_download_observer.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_download_observer.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 100 matching lines @@
   return system_service;
 }
 
 // Substitutes virtual gdata path for local temporary path.
 void SubstituteGDataDownloadPathInternal(Profile* profile,
     const GDataDownloadObserver::SubstituteGDataDownloadPathCallback&
         callback) {
   DVLOG(1) << "SubstituteGDataDownloadPathInternal";
 
   const FilePath gdata_tmp_download_dir = GetSystemService(profile)->cache()->
-      GetCacheDirectoryPath(GDataCache::CACHE_TYPE_TMP_DOWNLOADS);
+      GetCacheDirectoryPath(DriveCache::CACHE_TYPE_TMP_DOWNLOADS);
 
   // Swap the gdata path with a local path. Local path must be created
   // on a blocking thread.
   FilePath* gdata_tmp_download_path(new FilePath());
   BrowserThread::GetBlockingPool()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GDataDownloadObserver::GetGDataTempDownloadPath,
                  gdata_tmp_download_dir,
                  gdata_tmp_download_path),
       base::Bind(&RunSubstituteGDataDownloadCallback,
@@ skipping 235 matching lines @@
 
   const DownloadItem::DownloadState state = download->GetState();
   switch (state) {
     case DownloadItem::IN_PROGRESS:
       AddPendingDownload(download);
       UploadDownloadItem(download);
       break;
 
     case DownloadItem::COMPLETE:
       UploadDownloadItem(download);
-      MoveFileToGDataCache(download);
+      MoveFileToDriveCache(download);
       RemovePendingDownload(download);
       break;
 
     // TODO(achuith): Stop the pending upload and delete the file.
     case DownloadItem::CANCELLED:
     case DownloadItem::INTERRUPTED:
       RemovePendingDownload(download);
       break;
 
     default:
@@ skipping 233 matching lines @@
     DVLOG(1) << "Pending download not found" << download_id;
     return;
   }
   DVLOG(1) << "Completing upload for download ID " << download_id;
   DownloadItem* download_item = iter->second;
 
   UploadingUserData* upload_data = GetUploadingUserData(download_item);
   DCHECK(upload_data);
 
   // Take ownership of the DocumentEntry from UploadFileInfo. This is used by
-  // GDataFileSystem::AddUploadedFile() to add the entry to GDataCache after the
+  // GDataFileSystem::AddUploadedFile() to add the entry to DriveCache after the
   // upload completes.
   upload_data->set_entry(upload_file_info->entry.Pass());
 
   // Allow the download item to complete.
   upload_data->CompleteDownload();
 }
 
-void GDataDownloadObserver::MoveFileToGDataCache(DownloadItem* download) {
+void GDataDownloadObserver::MoveFileToDriveCache(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UploadingUserData* upload_data = GetUploadingUserData(download);
   if (!upload_data) {
     NOTREACHED();
     return;
   }
 
   // Pass ownership of the DocumentEntry object.
   scoped_ptr<DocumentEntry> entry = upload_data->entry_passed();
   if (!entry.get()) {
     NOTREACHED();
     return;
   }
 
   if (upload_data->is_overwrite()) {
     file_system_->UpdateEntryData(upload_data->resource_id(),
                                   upload_data->md5(),
                                   entry.Pass(),
                                   download->GetTargetFilePath(),
                                   base::Bind(&base::DoNothing));
   } else {
     // Move downloaded file to gdata cache. Note that |content_file_path| should
     // use the final target path (download->GetTargetFilePath()) when the
     // download item has transitioned to the DownloadItem::COMPLETE state.
     file_system_->AddUploadedFile(UPLOAD_NEW_FILE,
                                   upload_data->virtual_dir_path(),
                                   entry.Pass(),
                                   download->GetTargetFilePath(),
-                                  GDataCache::FILE_OPERATION_MOVE,
+                                  DriveCache::FILE_OPERATION_MOVE,
                                   base::Bind(&base::DoNothing));
   }
 }
 
 }  // namespace gdata