Rename GData to Drive in drive_file_system_util

chrome/browser/chromeos/extensions/file_manager_util.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/extensions/file_manager_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 210 matching lines @@
   Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
   chrome::ShowMessageBox(
       browser->window()->GetNativeWindow(),
       l10n_util::GetStringFUTF16(
           IDS_FILE_BROWSER_ERROR_VIEWING_FILE_TITLE,
           UTF8ToUTF16(path.BaseName().value())),
       l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ERROR_VIEWING_FILE),
       chrome::MESSAGE_BOX_TYPE_WARNING);
 }
 
-// Called when a file on GData was found. Opens the file found at |file_path|
+// Called when a file on Drive was found. Opens the file found at |file_path|
 // in a new tab with a URL computed based on the |file_type|
 void OnGDataFileFound(Profile* profile,
                       const FilePath& file_path,
                       gdata::DriveFileType file_type,
                       gdata::DriveFileError error,
                       scoped_ptr<gdata::DriveEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (entry_proto.get() && !entry_proto->has_file_specific_info())
     error = gdata::DRIVE_FILE_ERROR_NOT_FOUND;
 
   if (error == gdata::DRIVE_FILE_OK) {
     GURL page_url;
     if (file_type == gdata::REGULAR_FILE) {
       page_url = gdata::util::GetFileResourceUrl(
           entry_proto->resource_id(),
           entry_proto->base_name());
     } else if (file_type == gdata::HOSTED_DOCUMENT) {
       page_url = GURL(entry_proto->file_specific_info().alternate_url());
     } else {
       NOTREACHED();
     }
     OpenNewTab(page_url, profile);
   } else {
     ShowWarningMessageBox(profile, file_path);
   }
 }
 
-// Called when a crx file on GData was downloaded.
+// Called when a crx file on Drive was downloaded.
 void OnCRXDownloadCallback(Browser* browser,
                            gdata::DriveFileError error,
                            const FilePath& file,
                            const std::string& unused_mime_type,
                            gdata::DriveFileType file_type) {
   if (error != gdata::DRIVE_FILE_OK || file_type != gdata::REGULAR_FILE)
     return;
   InstallCRX(browser, file);
 }
 
@@ skipping 365 matching lines @@
     // Override gdata resource to point to internal handler instead of file:
     // URL.
     if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
       gdata::DriveSystemService* system_service =
           gdata::DriveSystemServiceFactory::GetForProfile(profile);
       if (!system_service)
         return false;
 
       // Open the file once the file is found.
       system_service->file_system()->GetEntryInfoByPath(
-          gdata::util::ExtractGDataPath(path),
+          gdata::util::ExtractDrivePath(path),
           base::Bind(&OnGDataFileFound, profile, path, gdata::REGULAR_FILE));
       return true;
     }
     OpenNewTab(page_url, NULL);
     return true;
   }
 
   if (IsSupportedGDocsExtension(file_extension.data())) {
     if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
-      // The file is on Google Docs. Get the Docs from the GData service.
+      // The file is on Google Docs. Get the Docs from the Drive service.
       gdata::DriveSystemService* system_service =
           gdata::DriveSystemServiceFactory::GetForProfile(profile);
       if (!system_service)
         return false;
 
       system_service->file_system()->GetEntryInfoByPath(
-          gdata::util::ExtractGDataPath(path),
+          gdata::util::ExtractDrivePath(path),
           base::Bind(&OnGDataFileFound, profile, path,
                      gdata::HOSTED_DOCUMENT));
     } else {
       // The file is local (downloaded from an attachment or otherwise copied).
       // Parse the file to extract the Docs url and open this url.
       BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
           base::Bind(&ReadUrlFromGDocOnFileThread, path));
     }
     return true;
   }
@@ skipping 25 matching lines @@
 
     application_launch::LaunchParams params(profile, extension,
                                             extension_misc::LAUNCH_WINDOW,
                                             NEW_FOREGROUND_TAB);
     params.override_url = GetVideoPlayerUrl(url);
     application_launch::OpenApplication(params);
     return true;
   }
 
   if (IsCRXFile(file_extension.data())) {
-    if (gdata::util::IsUnderGDataMountPoint(path)) {
+    if (gdata::util::IsUnderDriveMountPoint(path)) {
       gdata::DriveSystemService* system_service =
           gdata::DriveSystemServiceFactory::GetForProfile(profile);
       if (!system_service)
         return false;
       system_service->file_system()->GetFileByPath(
-          gdata::util::ExtractGDataPath(path),
+          gdata::util::ExtractDrivePath(path),
           base::Bind(&OnCRXDownloadCallback, browser),
           gdata::GetContentCallback());
     } else {
       InstallCRX(browser, path);
     }
     return true;
   }
 
   // Unknown file type. Record UMA and show an error message.
   size_t extension_index = UMAExtensionIndex(file_extension.data(),
@@ skipping 45 matching lines @@
           OperationRegistry::ProgressStatus>::const_iterator iter =
               list.begin();
        iter != list.end(); ++iter) {
     result_list->Append(
         ProgessStatusToDictionaryValue(profile, origin_url, *iter));
   }
   return result_list.release();
 }
 
 }  // namespace file_manager_util