Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/chromeos/gdata/gdata_file_system.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_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 125 matching lines @@
   // Used to propagate events from GDataWapiFeedLoader.
   virtual void OnDirectoryChanged(const FilePath& directory_path) OVERRIDE;
   virtual void OnDocumentFeedFetched(int num_accumulated_entries) OVERRIDE;
   virtual void OnFeedFromServerLoaded() OVERRIDE;
 
   // Used in tests to load the root feed from the cache.
   void LoadRootFeedFromCacheForTesting();
 
   // Used in tests to update the file system from |feed_list|.
   // See also the comment at GDataWapiFeedLoader::UpdateFromFeed().
-  GDataFileError UpdateFromFeedForTesting(
+  DriveFileError UpdateFromFeedForTesting(
       const std::vector<DocumentFeed*>& feed_list,
       int64 start_changestamp,
       int64 root_feed_changestamp);
 
  private:
   friend class GDataFileSystemTest;
   FRIEND_TEST_ALL_PREFIXES(GDataFileSystemTest,
                            FindFirstMissingParentDirectory);
 
   // Defines possible search results of FindFirstMissingParentDirectory().
@@ skipping 24 matching lines @@
   // Struct used for AddUploadedFile.
   struct AddUploadedFileParams;
 
   // Callback passed to |LoadFeedFromServer| from |Search| method.
   // |callback| is that should be run with data received from
   // |LoadFeedFromServer|.
   // |params| params used for getting document feed for content search.
   // |error| error code returned by |LoadFeedFromServer|.
   void OnSearch(const SearchCallback& callback,
                 GetDocumentsParams* params,
-                GDataFileError error);
+                DriveFileError error);
 
   // Part of TransferFileFromLocalToRemote(). Called after
   // GetEntryInfoByPath() is complete.
   void TransferFileFromLocalToRemoteAfterGetEntryInfo(
       const FilePath& local_src_file_path,
       const FilePath& remote_dest_file_path,
       const FileOperationCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Initiates transfer of |local_file_path| with |resource_id| to
   // |remote_dest_file_path|. |local_file_path| must be a file from the local
   // file system, |remote_dest_file_path| is the virtual destination path within
   // gdata file system. If |resource_id| is a non-empty string, the transfer is
   // handled by CopyDocumentToDirectory. Otherwise, the transfer is handled by
   // TransferRegularFile.
   //
   // Must be called from *UI* thread. |callback| is run on the calling thread.
@@ skipping 16 matching lines @@
   // Invoked during the process of CreateFile.
   // First, FindEntryByPathAsyncOnUIThread is called and the result is returned
   // to OnGetEntryInfoForCreateFile. By using the information, CreateFile deals
   // with the cases when an entry already existed at the path. If there was no
   // entry, a new empty file is uploaded, and when it finishes
   // DidUploadForCreateBrandNewFile does the final clean up.
   // |callback| must not be null.
   void OnGetEntryInfoForCreateFile(const FilePath& file_path,
                                    bool is_exclusive,
                                    const FileOperationCallback& callback,
-                                   GDataFileError result,
+                                   DriveFileError result,
                                    scoped_ptr<DriveEntryProto> entry_proto);
   void DoUploadForCreateBrandNewFile(const FilePath& remote_path,
                                      FilePath* local_path,
                                      const FileOperationCallback& callback);
   void DidUploadForCreateBrandNewFile(const FilePath& local_path,
                                       const FileOperationCallback& callback,
-                                      GDataFileError result);
+                                      DriveFileError result);
 
   // Invoked upon completion of GetEntryInfoByPath initiated by
   // GetFileByPath. It then continues to invoke GetResolvedFileByPath.
   void OnGetEntryInfoCompleteForGetFileByPath(
       const FilePath& file_path,
       const GetFileCallback& get_file_callback,
       const GetContentCallback& get_content_callback,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> file_info);
 
   // Invoked upon completion of GetEntryInfoByPath initiated by OpenFile.
   // It then continues to invoke GetResolvedFileByPath and proceeds to
   // OnGetFileCompleteForOpenFile.
   void OnGetEntryInfoCompleteForOpenFile(
       const FilePath& file_path,
       const OpenFileCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> file_info);
 
   // Invoked at the last step of OpenFile. It removes |file_path| from the
   // current set of opened files if |result| is an error, and then invokes the
   // |callback| function.
   void OnOpenFileFinished(const FilePath& file_path,
                           const OpenFileCallback& callback,
-                          GDataFileError result,
+                          DriveFileError result,
                           const FilePath& cache_file_path);
 
   // Invoked during the process of CloseFile. What is done here is as follows:
   // 1) Gets resource_id and md5 of the entry at |file_path|.
   // 2) Commits the modification to the cache system.
   // 3) Removes the |file_path| from the remembered set of opened files.
   // 4) Invokes the user-supplied |callback|.
   // |callback| must not be null.
   void CloseFileOnUIThreadAfterGetEntryInfo(
       const FilePath& file_path,
       const FileOperationCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> entry_proto);
   void CloseFileOnUIThreadAfterCommitDirtyInCache(
       const FileOperationCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       const std::string& resource_id,
       const std::string& md5);
   void CloseFileOnUIThreadFinalize(const FilePath& file_path,
                                    const FileOperationCallback& callback,
-                                   GDataFileError result);
+                                   DriveFileError result);
 
   // Invoked upon completion of GetFileByPath initiated by Copy. If
   // GetFileByPath reports no error, calls TransferRegularFile to transfer
   // |local_file_path| to |remote_dest_file_path|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   void OnGetFileCompleteForCopy(const FilePath& remote_dest_file_path,
                                 const FileOperationCallback& callback,
-                                GDataFileError error,
+                                DriveFileError error,
                                 const FilePath& local_file_path,
                                 const std::string& unused_mime_type,
                                 DriveFileType file_type);
 
   // Invoked upon completion of GetFileByPath initiated by
   // TransferFileFromRemoteToLocal. If GetFileByPath reports no error, calls
   // CopyLocalFileOnBlockingPool to copy |local_file_path| to
   // |local_dest_file_path|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   void OnGetFileCompleteForTransferFile(const FilePath& local_dest_file_path,
                                         const FileOperationCallback& callback,
-                                        GDataFileError error,
+                                        DriveFileError error,
                                         const FilePath& local_file_path,
                                         const std::string& unused_mime_type,
                                         DriveFileType file_type);
 
   // Invoked upon completion of GetFileByPath initiated by OpenFile. If
   // GetFileByPath is successful, calls MarkDirtyInCache to mark the cache
   // file as dirty for the file identified by |file_info.resource_id| and
   // |file_info.md5|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   void OnGetFileCompleteForOpenFile(
       const OpenFileCallback& callback,
       const GetFileCompleteForOpenParams& file_info,
-      GDataFileError error,
+      DriveFileError error,
       const FilePath& file_path,
       const std::string& mime_type,
       DriveFileType file_type);
 
   // Copies a document with |resource_id| to the directory at |dir_path|
   // and names the copied document as |new_name|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   void CopyDocumentToDirectory(const FilePath& dir_path,
@@ skipping 10 matching lines @@
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   void Rename(const FilePath& file_path,
               const FilePath::StringType& new_name,
               const FileMoveCallback& callback);
 
   // Part of Rename(). Called after GetEntryInfoByPath() is complete.
   void RenameAfterGetEntryInfo(const FilePath& file_path,
                                const FilePath::StringType& new_name,
                                const FileMoveCallback& callback,
-                               GDataFileError error,
+                               DriveFileError error,
                                scoped_ptr<DriveEntryProto> entry_proto);
 
   // Moves a file or directory at |file_path| in the root directory to
   // another directory at |dir_path|. This function does nothing if
   // |dir_path| points to the root directory.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   void MoveEntryFromRootDirectory(const FilePath& dir_path,
                                   const FileOperationCallback& callback,
-                                  GDataFileError error,
+                                  DriveFileError error,
                                   const FilePath& file_path);
 
   // Part of MoveEntryFromRootDirectory(). Called after
   // GetEntryInfoPairByPaths() is complete. |callback| must not be null.
   void MoveEntryFromRootDirectoryAfterGetEntryInfoPair(
     const FileOperationCallback& callback,
     scoped_ptr<EntryInfoPairResult> result);
 
   // Part of RemoveEntryFromNonRootDirectory(). Called after
   // GetEntryInfoPairByPaths() is complete. |callback| must not be null.
   void RemoveEntryFromNonRootDirectoryAfterEntryInfoPair(
     const FileMoveCallback& callback,
     scoped_ptr<EntryInfoPairResult> result);
 
   // Removes a file or directory at |file_path| from the current directory if
   // it's not in the root directory. This essentially moves an entry to the
   // root directory on the server side.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   void RemoveEntryFromNonRootDirectory(const FileMoveCallback& callback,
-                                       GDataFileError error,
+                                       DriveFileError error,
                                        const FilePath& file_path);
 
   // Removes file under |file_path| on the client side.
   // |resource_id| contains the resource id of the removed file if it was a
   // file.
   // Return PLATFORM_FILE_OK if successful.
-  GDataFileError RemoveEntryLocally(const FilePath& file_path,
+  DriveFileError RemoveEntryLocally(const FilePath& file_path,
                                     std::string* resource_id);
 
   // A pass-through callback used for bridging from
   // FileMoveCallback to FileOperationCallback.
   void OnFilePathUpdated(const FileOperationCallback& cllback,
-                         GDataFileError error,
+                         DriveFileError error,
                          const FilePath& file_path);
 
   // Invoked upon completion of MarkDirtyInCache initiated by OpenFile. Invokes
   // |callback| with |cache_file_path|, which is the path of the cache file
   // ready for modification.
   //
   // Must be called on UI thread.
   void OnMarkDirtyInCacheCompleteForOpenFile(const OpenFileCallback& callback,
-                                             GDataFileError error,
+                                             DriveFileError error,
                                              const std::string& resource_id,
                                              const std::string& md5,
                                              const FilePath& cache_file_path);
 
   // Callback for handling document copy attempt.
   // |callback| must not be null.
   void OnCopyDocumentCompleted(const FilePath& dir_path,
                                const FileOperationCallback& callback,
                                GDataErrorCode status,
                                scoped_ptr<base::Value> data);
@@ skipping 47 matching lines @@
   // Similar to OnFileDownloaded() but takes |has_enough_space| so we report
   // an error in case we don't have enough disk space.
   void OnFileDownloadedAndSpaceChecked(const GetFileFromCacheParams& params,
                                        GDataErrorCode status,
                                        const GURL& content_url,
                                        const FilePath& downloaded_file_path,
                                        bool* has_enough_space);
 
   // Callback for handling internal StoreToCache() calls after downloading
   // file content.
-  void OnDownloadStoredToCache(GDataFileError error,
+  void OnDownloadStoredToCache(DriveFileError error,
                                const std::string& resource_id,
                                const std::string& md5);
 
   // Callback for handling resource rename attempt. Renames a file or
   // directory at |file_path| on the client side.
   // |callback| must not be null.
   void RenameEntryLocally(const FilePath& file_path,
                           const FilePath::StringType& new_name,
                           const FileMoveCallback& callback,
                           GDataErrorCode status,
                           const GURL& document_url);
 
   // Callback for handling an attempt to remove a file or directory from
   // another directory. Moves a file or directory at |file_path| to root on
   // the client side.
   // |callback| must not be null.
   void MoveEntryToRootDirectoryLocally(const FileMoveCallback& callback,
                                        const FilePath& file_path,
                                        const FilePath& dir_path,
                                        GDataErrorCode status,
                                        const GURL& document_url);
 
   // Removes a file or directory under |file_path| on the client side and the
   // corresponding file from cache if it exists.  Returns PLATFORM_FILE_OK if
   // successful.
-  GDataFileError RemoveEntryAndCacheLocally(const FilePath& file_path);
+  DriveFileError RemoveEntryAndCacheLocally(const FilePath& file_path);
 
   // Callback when an entry is moved to another directory on the client side.
   // Notifies the directory change and runs |callback|.
   // |callback| may be null.
   void NotifyAndRunFileMoveCallback(
       const FileMoveCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       const FilePath& moved_file_path);
 
   // Callback when an entry is moved to another directory on the client side.
   // Notifies the directory change and runs |callback|.
   // |callback| must not be null.
   void NotifyAndRunFileOperationCallback(
       const FileOperationCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       const FilePath& moved_file_path);
 
   // FileMoveCallback for directory changes.
   void OnDirectoryChangeFileMoveCallback(
-      GDataFileError error,
+      DriveFileError error,
       const FilePath& directory_path);
 
   // Callback for GetEntryByResourceIdAsync.
   // Removes stale entry upon upload of file.
   void RemoveStaleEntryOnUpload(const std::string& resource_id,
                                 DriveDirectory* parent_dir,
                                 const FileMoveCallback& callback,
                                 DriveEntry* existing_entry);
 
   // Continues to add an uploaded file after existing entry has been deleted.
   void ContinueAddUploadedFile(AddUploadedFileParams* params,
-                               GDataFileError error,
+                               DriveFileError error,
                                const FilePath& file_path);
 
   // Adds the uploaded file to the cache.
   void AddUploadedFileToCache(AddUploadedFileParams* params,
-                              GDataFileError error,
+                              DriveFileError error,
                               const FilePath& file_path);
 
   // Converts |entry_value| into GFileDocument instance and adds it
   // to virtual file system at |directory_path|.
-  GDataFileError AddNewDirectory(const FilePath& directory_path,
+  DriveFileError AddNewDirectory(const FilePath& directory_path,
                                  base::Value* entry_value);
 
   // Given non-existing |directory_path|, finds the first missing parent
   // directory of |directory_path|.
   FindMissingDirectoryResult FindFirstMissingParentDirectory(
       const FilePath& directory_path,
       GURL* last_dir_content_url,
       FilePath* first_missing_parent_path);
 
   // Callback for handling results of ReloadFeedFromServerIfNeeded() initiated
   // from CheckForUpdates(). This callback checks whether feed is successfully
   // reloaded, and in case of failure, restores the content origin of the root
   // directory.
   void OnUpdateChecked(ContentOrigin initial_origin,
-                       GDataFileError error);
+                       DriveFileError error);
 
   // Notifies that the initial load is finished and runs |callback|.
   // |callback| must not be null.
   void NotifyInitialLoadFinishedAndRun(const FileOperationCallback& callback,
-                                       GDataFileError error);
+                                       DriveFileError error);
 
   // Helper function that completes bookkeeping tasks related to
   // completed file transfer.
   void OnTransferCompleted(const FileOperationCallback& callback,
-                           GDataFileError error,
+                           DriveFileError error,
                            scoped_ptr<UploadFileInfo> upload_file_info);
 
   // Kicks off file upload once it receives |file_size| and |content_type|.
   void StartFileUploadOnUIThread(const StartFileUploadParams& params,
-                                 GDataFileError* error,
+                                 DriveFileError* error,
                                  int64* file_size,
                                  std::string* content_type);
 
   // Part of StartFileUploadOnUIThread(). Called after GetEntryInfoByPath()
   // is complete.
   void StartFileUploadOnUIThreadAfterGetEntryInfo(
       const StartFileUploadParams& params,
       int64 file_size,
       std::string content_type,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Cache intermediate callbacks, that run on calling thread, for above cache
   // tasks that were run on blocking pool.
 
   // Helper function for internally handling responses from
   // GetFileFromCacheByResourceIdAndMd5() calls during processing of
   // GetFileByPath() request.
   void OnGetFileFromCache(const GetFileFromCacheParams& params,
-                          GDataFileError error,
+                          DriveFileError error,
                           const std::string& resource_id,
                           const std::string& md5,
                           const FilePath& cache_file_path);
 
   // Callback for |drive_service_->GetDocumentEntry|.
   // It is called before file download. If GetDocumentEntry was successful,
   // file download procedure is started for the file. The file is downloaded
   // from the content url extracted from the fetched metadata to
   // |cache_file_path|. Also, available space checks are done using file size
   // from the fetched metadata.
@@ skipping 15 matching lines @@
   // Initializes preference change observer.
   void InitializePreferenceObserver();
 
   // Part of GetEntryInfoByPathOnUIThread()
   // 1) Called when the feed is loaded.
   // 2) Called when an entry is found.
   // |callback| must not be null.
   void GetEntryInfoByPathOnUIThreadAfterLoad(
       const FilePath& file_path,
       const GetEntryInfoCallback& callback,
-      GDataFileError error);
+      DriveFileError error);
   void GetEntryInfoByPathOnUIThreadAfterGetEntry(
       const GetEntryInfoCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Part of ReadDirectoryByPathOnUIThread()
   // 1) Called when the feed is loaded.
   // 2) Called when an entry is found.
   // |callback| must not be null.
   void ReadDirectoryByPathOnUIThreadAfterLoad(
       const FilePath& file_path,
       const ReadDirectoryWithSettingCallback& callback,
-      GDataFileError error);
+      DriveFileError error);
   void ReadDirectoryByPathOnUIThreadAfterRead(
       const ReadDirectoryWithSettingCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProtoVector> entries);
 
   // Loads the feed from the cache or the server if not yet loaded. Runs
   // |callback| upon the completion with the error code.
   // |callback| must not be null.
   void LoadFeedIfNeeded(const FileOperationCallback& callback);
 
   // Gets |file_path| from the file system after the file info is already
   // resolved with GetEntryInfoByPath(). This function is called by
   // OnGetEntryInfoCompleteForGetFileByPath and
   // OnGetEntryInfoCompleteForOpenFile.
   void GetResolvedFileByPath(
       const FilePath& file_path,
       const GetFileCallback& get_file_callback,
       const GetContentCallback& get_content_callback,
-      GDataFileError error,
+      DriveFileError error,
       const DriveEntryProto* entry_proto);
 
   // Part of UpdateFileByResourceId(). Called when
   // DriveDirectory::GetEntryInfoByResourceId() is complete.
   // |callback| must not be null.
   void UpdateFileByEntryInfo(
       const FileOperationCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       const FilePath& /* drive_file_path */,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Part of UpdateFileByResourceId().
   // Called when DriveCache::GetFileOnUIThread() is completed for
   // UpdateFileByResourceId().
   // |callback| must not be null.
   void OnGetFileCompleteForUpdateFile(const FileOperationCallback& callback,
-                                      GDataFileError error,
+                                      DriveFileError error,
                                       const std::string& resource_id,
                                       const std::string& md5,
                                       const FilePath& cache_file_path);
 
   // Part of UpdateFileByResourceId().
   // Callback for getting the size of the cache file in the blocking pool.
   // |callback| must not be null.
   void OnGetFileSizeCompleteForUpdateFile(const FileOperationCallback& callback,
                                           const std::string& resource_id,
                                           const FilePath& cache_file_path,
-                                          GDataFileError* error,
+                                          DriveFileError* error,
                                           int64* file_size);
 
   // Part of UpdateFileByResourceId().
   // Callback for GDataRootDirectory::GetEntryByResourceIdAsync.
   // |callback| must not be null.
   void OnGetFileCompleteForUpdateFileByEntry(
       const FileOperationCallback& callback,
       int64 file_size,
       const FilePath& cache_file_path,
-      GDataFileError error,
+      DriveFileError error,
       const FilePath& drive_file_path,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Part of UpdateFileByResourceId().
   // Called when GDataUploader::UploadUpdatedFile() is completed for
   // UpdateFileByResourceId().
   // |callback| must not be null.
   void OnUpdatedFileUploaded(const FileOperationCallback& callback,
-                             GDataFileError error,
+                             DriveFileError error,
                              scoped_ptr<UploadFileInfo> upload_file_info);
 
   // The following functions are used to forward calls to asynchronous public
   // member functions to UI thread.
   void SearchAsyncOnUIThread(const std::string& search_query,
                              const GURL& next_feed,
                              const SearchCallback& callback);
   void OpenFileOnUIThread(const FilePath& file_path,
                           const OpenFileCallback& callback);
   void CloseFileOnUIThread(const FilePath& file_path,
@@ skipping 35 matching lines @@
                                     const GetEntryInfoCallback& callback);
   void GetEntryInfoByResourceIdOnUIThread(
       const std::string& resource_id,
       const GetEntryInfoWithFilePathCallback& callback);
   void ReadDirectoryByPathOnUIThread(
       const FilePath& file_path,
       const ReadDirectoryWithSettingCallback& callback);
   void RequestDirectoryRefreshOnUIThread(const FilePath& file_path);
   void OnRequestDirectoryRefresh(const FilePath& directory_path,
                                  GetDocumentsParams* params,
-                                 GDataFileError error);
+                                 DriveFileError error);
   void GetAvailableSpaceOnUIThread(const GetAvailableSpaceCallback& callback);
   void AddUploadedFileOnUIThread(UploadMode upload_mode,
                                  const FilePath& virtual_dir_path,
                                  scoped_ptr<DocumentEntry> entry,
                                  const FilePath& file_content_path,
                                  DriveCache::FileOperationType cache_operation,
                                  const base::Closure& callback);
   void UpdateEntryDataOnUIThread(const std::string& resource_id,
                                  const std::string& md5,
                                  scoped_ptr<DocumentEntry> entry,
@@ skipping 13 matching lines @@
     const FilePath& dest_file_path,
     const FileOperationCallback& callback,
     scoped_ptr<EntryInfoPairResult> result);
 
   // Part of RemoveOnUIThread(). Called after GetEntryInfoByPath() is
   // complete.
   void RemoveOnUIThreadAfterGetEntryInfo(
       const FilePath& file_path,
       bool is_recursive,
       const FileOperationCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Part of RequestDirectoryRefreshOnUIThread(). Called after
   // GetEntryInfoByPath() is complete.
   void RequestDirectoryRefreshOnUIThreadAfterGetEntryInfo(
       const FilePath& file_path,
-      GDataFileError error,
+      DriveFileError error,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Part of GetEntryByResourceId and GetEntryByPath. Checks whether there is a
   // local dirty cache for the entry, and if there is, replace the
   // PlatformFileInfo part of the |entry_proto| with the locally modified info.
   // |callback| must not be null.
   void CheckLocalModificationAndRun(scoped_ptr<DriveEntryProto> entry_proto,
                                     const GetEntryInfoCallback& callback);
   void CheckLocalModificationAndRunAfterGetCacheEntry(
       scoped_ptr<DriveEntryProto> entry_proto,
       const GetEntryInfoCallback& callback,
       bool success,
       const DriveCacheEntry& cache_entry);
   void CheckLocalModificationAndRunAfterGetCacheFile(
       scoped_ptr<DriveEntryProto> entry_proto,
       const GetEntryInfoCallback& callback,
-      GDataFileError error,
+      DriveFileError error,
       const std::string& resource_id,
       const std::string& md5,
       const FilePath& local_cache_path);
   void CheckLocalModificationAndRunAfterGetFileInfo(
       scoped_ptr<DriveEntryProto> entry_proto,
       const GetEntryInfoCallback& callback,
       base::PlatformFileInfo* file_info,
       bool* get_file_info_result);
 
   // All members should be accessed only on UI thread. Do not post tasks to
@@ skipping 38 matching lines @@
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<GDataFileSystem> ui_weak_ptr_factory_;
   // Unlike other classes, we need this as we need this to redirect a task
   // from IO thread to UI thread.
   base::WeakPtr<GDataFileSystem> ui_weak_ptr_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_