Rename GData* to Drive* in gdata.proto

chrome/browser/chromeos/gdata/gdata_test_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/gdata/gdata_directory_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 
 class FilePath;
 
 namespace gdata {
 
-class GDataEntryProto;
-class GDataCacheEntry;
+class DriveCacheEntry;
+class DriveEntryProto;

[kinaba, 2012/08/21 09:15:14]

No declaration for DriveEntryProtoVector.

[kochi, 2012/08/21 09:37:34]

Done.

 
 namespace test_util {
 
 // Runs a task posted to the blocking pool, including subquent tasks posted
 // to the UI message loop and the blocking pool.
 //
 // A task is often posted to the blocking pool with PostTaskAndReply(). In
 // that case, a task is posted back to the UI message loop, which can again
 // post a task to the blocking pool. This function processes these tasks
 // 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,
   TEST_CACHE_STATE_PRESENT    = 1 << 1,
   TEST_CACHE_STATE_DIRTY      = 1 << 2,
   TEST_CACHE_STATE_MOUNTED    = 1 << 3,
   TEST_CACHE_STATE_PERSISTENT = 1 << 4,
 };
 
 // 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.
 void CopyErrorCodeFromFileOperationCallback(GDataFileError* output,
                                             GDataFileError error);
 
 // Copies |error| and |moved_file_path| to |out_error| and |out_file_path|.
 // Used to run asynchronous functions that take FileMoveCallback from tests.
 void CopyResultsFromFileMoveCallback(GDataFileError* out_error,
                                      FilePath* out_file_path,
                                      GDataFileError error,
                                      const FilePath& moved_file_path);
 
 // Copies |error| and |entry_proto| to |out_error| and |out_entry_proto|
 // respectively. Used to run asynchronous functions that take
 // 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
 // asynchronous functions that take GetEntryInfoWithFilePathCallback from
 // tests.
 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.
 void CopyResultsFromGetEntryInfoPairCallback(
     scoped_ptr<EntryInfoPairResult>* out_result,
     scoped_ptr<EntryInfoPairResult> result);
 
 }  // namespace test_util
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_