Rename GData to Drive in drive_file_system_util

chrome/browser/chromeos/gdata/drive_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/drive_download_observer.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 157 matching lines @@
 // Callback for DriveServiceInterface::Authenticate.
 void OnAuthenticate(Profile* profile,
                     const FilePath& drive_path,
                     const base::Closure& substitute_callback,
                     GDataErrorCode error,
                     const std::string& token) {
   DVLOG(1) << "OnAuthenticate";
 
   if (error == HTTP_SUCCESS) {
     const FilePath drive_dir_path =
-        util::ExtractGDataPath(drive_path.DirName());
+        util::ExtractDrivePath(drive_path.DirName());
     // Ensure the directory exists. This also forces DriveFileSystem to
     // initialize DriveRootDirectory.
     GetSystemService(profile)->file_system()->GetEntryInfoByPath(
         drive_dir_path,
         base::Bind(&OnEntryFound, profile, drive_dir_path,
                    substitute_callback));
   } else {
     // TODO(achuith): Handle this.
     NOTREACHED();
   }
@@ skipping 31 matching lines @@
 }
 
 // static
 void DriveDownloadObserver::SubstituteDriveDownloadPath(Profile* profile,
     const FilePath& drive_path, content::DownloadItem* download,
     const SubstituteDriveDownloadPathCallback& callback) {
   DVLOG(1) << "SubstituteDriveDownloadPath " << drive_path.value();
 
   SetDownloadParams(drive_path, download);
 
-  if (util::IsUnderGDataMountPoint(drive_path)) {
+  if (util::IsUnderDriveMountPoint(drive_path)) {
     // Can't access drive if we're not authenticated.
     // We set off a chain of callbacks as follows:
     // DriveServiceInterface::Authenticate
     //   OnAuthenticate calls DriveFileSystem::GetEntryInfoByPath
     //     OnEntryFound calls DriveFileSystem::CreateDirectory (if necessary)
     //       OnCreateDirectory calls SubstituteDriveDownloadPathInternal
     GetSystemService(profile)->drive_service()->Authenticate(
         base::Bind(&OnAuthenticate, profile, drive_path,
                    base::Bind(&SubstituteDriveDownloadPathInternal,
                               profile, callback)));
   } else {
     callback.Run(drive_path);
   }
 }
 
 // static
 void DriveDownloadObserver::SetDownloadParams(const FilePath& drive_path,
                                               DownloadItem* download) {
   if (!download)
     return;
 
-  if (util::IsUnderGDataMountPoint(drive_path)) {
+  if (util::IsUnderDriveMountPoint(drive_path)) {
     download->SetUserData(&kGDataPathKey,
                           new DriveUserData(drive_path));
     download->SetDisplayName(drive_path.BaseName());
     download->SetIsTemporary(true);
   } else if (IsDriveDownload(download)) {
     // This may have been previously set if the default download folder is
     // /drive, and the user has now changed the download target to a local
     // folder.
     download->SetUserData(&kGDataPathKey, NULL);
     download->SetDisplayName(drive_path);
     // TODO(achuith): This is not quite right.
     download->SetIsTemporary(false);
   }
 }
 
 // static
 FilePath DriveDownloadObserver::GetDrivePath(DownloadItem* download) {
   DriveUserData* data = GetDriveUserData(download);
   // If data is NULL, we've somehow lost the gdata path selected by the file
   // picker.
   DCHECK(data);
-  return data ? util::ExtractGDataPath(data->file_path()) : FilePath();
+  return data ? util::ExtractDrivePath(data->file_path()) : FilePath();
 }
 
 // static
 bool DriveDownloadObserver::IsDriveDownload(DownloadItem* download) {
   // We use the existence of the DriveUserData object in download as a
   // signal that this is a DriveDownload.
   return !!GetDriveUserData(download);
 }
 
 // static
@@ skipping 380 matching lines @@
     file_system_->AddUploadedFile(UPLOAD_NEW_FILE,
                                   upload_data->virtual_dir_path(),
                                   entry.Pass(),
                                   download->GetTargetFilePath(),
                                   DriveCache::FILE_OPERATION_MOVE,
                                   base::Bind(&base::DoNothing));
   }
 }
 
 }  // namespace gdata