Rename GData* to Drive* in gdata.proto

chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc

Index: chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc b/chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc
index ad6c9da6f45d49fcb639e6e41e14137c53e5ab60..c263687a8792ffefd82af6162cddf225ca3addf7 100644
--- a/chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/gdata/gdata.pb.h"
+#include "chrome/browser/chromeos/gdata/drive.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_cache.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
 #include "chrome/browser/chromeos/gdata/gdata_test_util.h"
@@ -192,9 +192,9 @@ void InitFromDBCallback(GDataFileError expected_error,
 
 // Callback for GDataDirectoryService::ReadDirectoryByPath.
 void ReadDirectoryByPathCallback(
-    scoped_ptr<GDataEntryProtoVector>* result,
+    scoped_ptr<DriveEntryProtoVector>* result,
     GDataFileError error,
-    scoped_ptr<GDataEntryProtoVector> entries) {
+    scoped_ptr<DriveEntryProtoVector> entries) {
   EXPECT_EQ(GDATA_FILE_OK, error);
   *result = entries.Pass();
 }
@@ -203,8 +203,8 @@ void ReadDirectoryByPathCallback(
 
 TEST(GDataDirectoryServiceTest, VersionCheck) {
   // Set up the root directory.
-  GDataRootDirectoryProto proto;
-  GDataEntryProto* mutable_entry =
+  DriveRootDirectoryProto proto;
+  DriveEntryProto* mutable_entry =
       proto.mutable_gdata_directory()->mutable_gdata_entry();
   mutable_entry->mutable_file_info()->set_is_directory(true);
   mutable_entry->set_resource_id(kGDataRootDirectoryResourceId);
@@ -325,7 +325,7 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoByResourceId) {
   // Confirm that an existing file is found.
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   FilePath drive_file_path;
-  scoped_ptr<GDataEntryProto> entry_proto;
+  scoped_ptr<DriveEntryProto> entry_proto;
   directory_service.GetEntryInfoByResourceId(
       "file_resource_id:file4",
       base::Bind(&test_util::CopyResultsFromGetEntryInfoWithFilePathCallback,
@@ -357,7 +357,7 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoByPath) {
 
   // Confirm that an existing file is found.
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
-  scoped_ptr<GDataEntryProto> entry_proto;
+  scoped_ptr<DriveEntryProto> entry_proto;
   directory_service.GetEntryInfoByPath(
       FilePath::FromUTF8Unsafe("drive/dir1/file4"),
       base::Bind(&test_util::CopyResultsFromGetEntryInfoCallback,
@@ -388,7 +388,7 @@ TEST(GDataDirectoryServiceTest, ReadDirectoryByPath) {
 
   // Confirm that an existing directory is found.
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
-  scoped_ptr<GDataEntryProtoVector> entries;
+  scoped_ptr<DriveEntryProtoVector> entries;
   directory_service.ReadDirectoryByPath(
       FilePath::FromUTF8Unsafe("drive/dir1"),
       base::Bind(&test_util::CopyResultsFromReadDirectoryCallback,