Rename GData* to Drive* in gdata.proto

chrome/browser/chromeos/gdata/gdata_test_util.h

Index: chrome/browser/chromeos/gdata/gdata_test_util.h
diff --git a/chrome/browser/chromeos/gdata/gdata_test_util.h b/chrome/browser/chromeos/gdata/gdata_test_util.h
index 8bc4bdb55d813471636dd3044e3e1b9a3c7c3331..a0b25b737702de37053ffec99c09c7a0d0458d5b 100644
--- a/chrome/browser/chromeos/gdata/gdata_test_util.h
+++ b/chrome/browser/chromeos/gdata/gdata_test_util.h
@@ -13,8 +13,10 @@ class FilePath;
 
 namespace gdata {
 
-class GDataEntryProto;
-class GDataCacheEntry;
+class DriveCacheEntry;
+class DriveEntryProto;
+
+typedef std::vector<DriveEntryProto> DriveEntryProtoVector;
 
 namespace test_util {
 
@@ -27,7 +29,7 @@ namespace test_util {
 // repeatedly.
 void RunBlockingPoolTask();
 
-// This is a bitmask of cache states in GDataCacheEntry. Used only in tests.
+// This is a bitmask of cache states in DriveCacheEntry. Used only in tests.
 enum TestGDataCacheState {
   TEST_CACHE_STATE_NONE       = 0,
   TEST_CACHE_STATE_PINNED     = 1 << 0,
@@ -38,11 +40,11 @@ enum TestGDataCacheState {
 };
 
 // Converts |cache_state| which is a bit mask of TestGDataCacheState, to a
-// GDataCacheEntry.
-GDataCacheEntry ToCacheEntry(int cache_state);
+// DriveCacheEntry.
+DriveCacheEntry ToCacheEntry(int cache_state);
 
 // Returns true if the cache state of the given two cache entries are equal.
-bool CacheStatesEqual(const GDataCacheEntry& a, const GDataCacheEntry& b);
+bool CacheStatesEqual(const DriveCacheEntry& a, const DriveCacheEntry& b);
 
 // Copies |error| to |output|. Used to run asynchronous functions that take
 // FileOperationCallback from tests.
@@ -61,18 +63,18 @@ void CopyResultsFromFileMoveCallback(GDataFileError* out_error,
 // GetEntryInfoCallback from tests.
 void CopyResultsFromGetEntryInfoCallback(
     GDataFileError* out_error,
-    scoped_ptr<GDataEntryProto>* out_entry_proto,
+    scoped_ptr<DriveEntryProto>* out_entry_proto,
     GDataFileError error,
-    scoped_ptr<GDataEntryProto> entry_proto);
+    scoped_ptr<DriveEntryProto> entry_proto);
 
 // Copies |error| and |entries| to |out_error| and |out_entries|
 // respectively. Used to run asynchronous functions that take
 // GetEntryInfoCallback from tests.
 void CopyResultsFromReadDirectoryCallback(
     GDataFileError* out_error,
-    scoped_ptr<GDataEntryProtoVector>* out_entries,
+    scoped_ptr<DriveEntryProtoVector>* out_entries,
     GDataFileError error,
-    scoped_ptr<GDataEntryProtoVector> entries);
+    scoped_ptr<DriveEntryProtoVector> entries);
 
 // Copies |error|, |drive_file_path|, and |entry_proto| to |out_error|,
 // |out_drive_file_path|, and |out_entry_proto| respectively. Used to run
@@ -81,10 +83,10 @@ void CopyResultsFromReadDirectoryCallback(
 void CopyResultsFromGetEntryInfoWithFilePathCallback(
     GDataFileError* out_error,
     FilePath* out_drive_file_path,
-    scoped_ptr<GDataEntryProto>* out_entry_proto,
+    scoped_ptr<DriveEntryProto>* out_entry_proto,
     GDataFileError error,
     const FilePath& drive_file_path,
-    scoped_ptr<GDataEntryProto> entry_proto);
+    scoped_ptr<DriveEntryProto> entry_proto);
 
 // Copies |result| to |out_result|. Used to run asynchronous functions
 // that take GetEntryInfoPairCallback from tests.