Rename GData* to Drive* in gdata.proto

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 41 matching lines @@
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/gdata/drive.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
 using content::BrowserThread;
 using content::WebContents;
@@ skipping 33 matching lines @@
 }
 
 std::string GetUserEmail() {
   chromeos::UserManager* manager = chromeos::UserManager::Get();
   if (!manager)
     return std::string();
   else
     return manager->GetLoggedInUser().display_email();
 }
 
-bool ScreenshotGDataTimestampComp(const gdata::GDataEntryProto& entry1,
-                                  const gdata::GDataEntryProto& entry2) {
+bool ScreenshotGDataTimestampComp(const gdata::DriveEntryProto& entry1,
+                                  const gdata::DriveEntryProto& entry2) {
   return entry1.file_info().last_modified() >
       entry2.file_info().last_modified();
 }
 
 void ReadDirectoryCallback(size_t max_saved,
                            std::vector<std::string>* saved_screenshots,
                            base::Closure callback,
                            gdata::GDataFileError error,
                            bool hide_hosted_documents,
-                           scoped_ptr<gdata::GDataEntryProtoVector> entries) {
+                           scoped_ptr<gdata::DriveEntryProtoVector> entries) {
   if (error != gdata::GDATA_FILE_OK) {
     callback.Run();
     return;
   }
 
   size_t max_scan = std::min(kMaxNumScanFiles, entries->size());
-  std::vector<gdata::GDataEntryProto> screenshot_entries;
+  std::vector<gdata::DriveEntryProto> screenshot_entries;
   for (size_t i = 0; i < max_scan; ++i) {
-    const gdata::GDataEntryProto& entry = (*entries)[i];
+    const gdata::DriveEntryProto& entry = (*entries)[i];
     if (StartsWithASCII(entry.base_name(), kScreenshotPrefix, true) &&
         EndsWith(entry.base_name(), kScreenshotSuffix, true)) {
       screenshot_entries.push_back(entry);
     }
   }
 
   size_t sort_size = std::min(max_saved, screenshot_entries.size());
   std::partial_sort(screenshot_entries.begin(),
                     screenshot_entries.begin() + sort_size,
                     screenshot_entries.end(),
                     ScreenshotGDataTimestampComp);
   for (size_t i = 0; i < sort_size; ++i) {
-    const gdata::GDataEntryProto& entry = screenshot_entries[i];
+    const gdata::DriveEntryProto& entry = screenshot_entries[i];
     saved_screenshots->push_back(
         std::string(kSavedScreenshotsUrl) + entry.resource_id());
   }
   callback.Run();
 }
 
 #else
 
 std::string GetUserEmail() {
   Profile* profile = ProfileManager::GetLastUsedProfile();
@@ skipping 586 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