Rename GData to Drive in drive_file_system_util

chrome/browser/ui/webui/feedback_ui.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/ui/webui/feedback_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 543 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 void FeedbackHandler::HandleRefreshSavedScreenshots(const ListValue*) {
   std::vector<std::string>* saved_screenshots = new std::vector<std::string>;
   FilePath filepath = DownloadPrefs::FromBrowserContext(
       tab_->GetBrowserContext())->DownloadPath();
   base::Closure refresh_callback = base::Bind(
       &FeedbackHandler::RefreshSavedScreenshotsCallback,
       AsWeakPtr(), base::Owned(saved_screenshots));
-  if (gdata::util::IsUnderGDataMountPoint(filepath)) {
+  if (gdata::util::IsUnderDriveMountPoint(filepath)) {
     GetMostRecentScreenshotsGData(
         filepath, saved_screenshots, kMaxSavedScreenshots, refresh_callback);
   } else {
     BrowserThread::PostTaskAndReply(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&FeedbackUI::GetMostRecentScreenshots, filepath,
                    base::Unretained(saved_screenshots), kMaxSavedScreenshots),
         refresh_callback);
   }
 }
 
 void FeedbackHandler::RefreshSavedScreenshotsCallback(
     std::vector<std::string>* saved_screenshots) {
   ListValue screenshots_list;
   for (size_t i = 0; i < saved_screenshots->size(); ++i)
     screenshots_list.Append(new StringValue((*saved_screenshots)[i]));
   web_ui()->CallJavascriptFunction("setupSavedScreenshots", screenshots_list);
 }
 
 void FeedbackHandler::GetMostRecentScreenshotsGData(
     const FilePath& filepath, std::vector<std::string>* saved_screenshots,
     size_t max_saved, base::Closure callback) {
   gdata::DriveFileSystemInterface* file_system =
       gdata::DriveSystemServiceFactory::GetForProfile(
           Profile::FromWebUI(web_ui()))->file_system();
   file_system->ReadDirectoryByPath(
-      gdata::util::ExtractGDataPath(filepath),
+      gdata::util::ExtractDrivePath(filepath),
       base::Bind(&ReadDirectoryCallback, max_saved, saved_screenshots,
                  callback));
 }
 #endif
 
 
 void FeedbackHandler::HandleSendReport(const ListValue* list_value) {
   if (!feedback_data_) {
     LOG(ERROR) << "Bug report hasn't been intialized yet.";
     return;
@@ skipping 145 matching lines @@
   size_t sort_size = std::min(max_saved, screenshot_filepaths.size());
   std::partial_sort(screenshot_filepaths.begin(),
                     screenshot_filepaths.begin() + sort_size,
                     screenshot_filepaths.end(),
                     ScreenshotTimestampComp);
   for (size_t i = 0; i < sort_size; ++i)
     saved_screenshots->push_back(std::string(kSavedScreenshotsUrl) +
                                    screenshot_filepaths[i]);
 }
 #endif