Rename GData* to Drive* in gdata.proto

chrome/browser/ui/webui/chromeos/drive_internals_ui.cc

Index: chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index e542542758d20626bd6d8a81271eafcb225666aa..6928bc3f7d9b0f2cb5a690b7a9edc9c1943bc376 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -12,8 +12,8 @@
 #include "base/path_service.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/gdata/auth_service.h"
+#include "chrome/browser/chromeos/gdata/drive.pb.h"
 #include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_cache.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system_interface.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
@@ -99,7 +99,7 @@ void GetFreeDiskSpace(const FilePath& home_path,
 
 // Formats |entry| into text.
 std::string FormatEntry(const FilePath& path,
-                        const gdata::GDataEntryProto& entry) {
+                        const gdata::DriveEntryProto& entry) {
   using base::StringAppendF;
   using gdata::util::FormatTimeAsString;
 
@@ -134,7 +134,7 @@ std::string FormatEntry(const FilePath& path,
                 FormatTimeAsString(creation_time).c_str());
 
   if (entry.has_file_specific_info()) {
-    const gdata::GDataFileSpecificInfo& file_specific_info =
+    const gdata::DriveFileSpecificInfo& file_specific_info =
         entry.file_specific_info();
     StringAppendF(&out, "    thumbnail_url: %s\n",
                   file_specific_info.thumbnail_url().c_str());
@@ -182,7 +182,7 @@ class DriveInternalsWebUIHandler : public content::WebUIMessageHandler {
   void OnReadDirectoryByPath(const FilePath& parent_path,
                              gdata::GDataFileError error,
                              bool hide_hosted_documents,
-                             scoped_ptr<gdata::GDataEntryProtoVector> entries);
+                             scoped_ptr<gdata::DriveEntryProtoVector> entries);
 
   // Called when GetResourceIdsOfAllFilesOnUIThread() is complete.
   void OnGetResourceIdsOfAllFiles(
@@ -191,7 +191,7 @@ class DriveInternalsWebUIHandler : public content::WebUIMessageHandler {
   // Called when GetCacheEntryOnUIThread() is complete.
   void OnGetCacheEntry(const std::string& resource_id,
                        bool success,
-                       const gdata::GDataCacheEntry& cache_entry);
+                       const gdata::DriveCacheEntry& cache_entry);
 
   // Called when GetFreeDiskSpace() is complete.
   void OnGetFreeDiskSpace(base::DictionaryValue* local_storage_summary);
@@ -293,14 +293,14 @@ void DriveInternalsWebUIHandler::OnReadDirectoryByPath(
     const FilePath& parent_path,
     gdata::GDataFileError error,
     bool hide_hosted_documents,
-    scoped_ptr<gdata::GDataEntryProtoVector> entries) {
+    scoped_ptr<gdata::DriveEntryProtoVector> entries) {
   --num_pending_reads_;
   if (error == gdata::GDATA_FILE_OK) {
     DCHECK(entries.get());
 
     std::string file_system_as_text;
     for (size_t i = 0; i < entries->size(); ++i) {
-      const gdata::GDataEntryProto& entry = (*entries)[i];
+      const gdata::DriveEntryProto& entry = (*entries)[i];
       const FilePath current_path = parent_path.Append(
           FilePath::FromUTF8Unsafe(entry.base_name()));
 
@@ -348,7 +348,7 @@ void DriveInternalsWebUIHandler::OnGetResourceIdsOfAllFiles(
 void DriveInternalsWebUIHandler::OnGetCacheEntry(
     const std::string& resource_id,
     bool success,
-    const gdata::GDataCacheEntry& cache_entry) {
+    const gdata::DriveCacheEntry& cache_entry) {
   if (!success) {
     LOG(ERROR) << "Failed to get cache entry: " << resource_id;
     return;