gdata: Remove GDataFileSystem::GetFileFromCacheByResourceIdAndMd5Internal()

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_
 #pragma once
 
 #include <sys/stat.h>
 
@@ skipping 38 matching lines @@
 
 // Callback for completion of cache operation.
 typedef base::Callback<void(base::PlatformFileError error,
                             const std::string& resource_id,
                             const std::string& md5)> CacheOperationCallback;
 
 // Callback for GetFileFromCache.
 typedef base::Callback<void(base::PlatformFileError error,
                             const std::string& resource_id,
                             const std::string& md5,
-                            const FilePath& gdata_file_path,
                             const FilePath& cache_file_path)>
     GetFileFromCacheCallback;
 
 // Used to get result of file search. Please note that |file| is a live
 // object provided to this callback under lock. It must not be used outside
 // of the callback method. This callback can be invoked on different thread
 // than one that started FileFileByPath() request.
 typedef base::Callback<void(base::PlatformFileError error,
                             const FilePath& directory_path,
                             GDataEntry* entry)>
@@ skipping 1032 matching lines @@
 
   // Task posted from GetFileFromCacheInternal to run on IO thread pool.
   // Checks if file corresponding to |resource_id| and |md5| exists in cache
   // map.
   // Even though this task doesn't involve IO operations, it still runs on the
   // IO thread pool, to force synchronization of all tasks on IO thread pool,
   // e.g. this absolute must execute after InitailizeCacheOnIOTheadPool.
   void GetFileFromCacheOnIOThreadPool(
       const std::string& resource_id,
       const std::string& md5,
-      const FilePath& gdata_file_path,
       base::PlatformFileError* error,
       FilePath* cache_file_path);
 
   // Task posted from GetCacheState to run on IO thread pool.
   // Checks if file corresponding to |resource_id| and |md5| exists in cache
   // map.  If yes, returns its cache state; otherwise, returns CACHE_STATE_NONE.
   // Even though this task doesn't involve IO operations, it still runs on the
   // IO thread pool, to force synchronization of all tasks on IO thread pool,
   // e.g. this absolutely must execute after InitailizeCacheOnIOTheadPool.
   void GetCacheStateOnIOThreadPool(
@@ skipping 85 matching lines @@
                     const CacheOperationCallback& callback);
 
   // Callback for Unpin. Runs |callback| and notifies the observers.
   void OnFileUnpinned(base::PlatformFileError* error,
                       const std::string& resource_id,
                       const std::string& md5,
                       const CacheOperationCallback& callback);
 
   // Helper function for internally handling responses from
   // GetFileFromCacheByResourceIdAndMd5() calls during processing of
-  // GetFile() request.
+  // GetFileByPath() request.
   void OnGetFileFromCache(const GetFileFromCacheParams& params,
                           base::PlatformFileError error,
                           const std::string& resource_id,
                           const std::string& md5,
-                          const FilePath& gdata_file_path,
                           const FilePath& cache_file_path);
 
   // Frees up disk space to store the given number of bytes, while keeping
   // kMinFreSpace bytes on the disk, if needed.  |has_enough_space| is
   // updated to indicate if we have enough space.
   void FreeDiskSpaceIfNeededFor(int64 num_bytes,
                                 bool* has_enough_space);
 
   // Frees up disk space if we have less than kMinFreSpace. |has_enough_space|
   // is updated to indicate if we have enough space.
   void FreeDiskSpaceIfNeeded(bool* has_enough_space);
 
   // Starts downloading a file if we have enough disk space indicated by
   // |has_enough_space|.
   void StartDownloadFileIfEnoughSpace(const GetFileFromCacheParams& params,
                                       const FilePath& cache_file_path,
                                       bool* has_enough_space);
 
   // Cache internal helper functions.
 
   // Unsafe (unlocked) version of InitializeCacheIfnecessary method.
   void UnsafeInitializeCacheIfNecessary();
 
   // Scans cache subdirectory |sub_dir_type| and build or update |cache_map|
   // with found file blobs or symlinks.
   void ScanCacheDirectory(
       GDataRootDirectory::CacheSubDirectoryType sub_dir_type,
       GDataRootDirectory::CacheMap* cache_map);
 
-  // Called from GetFileFromCacheByResourceIdAndMd5() and
-  // GetFileFromCacheByPath().
-  void GetFileFromCacheByResourceIdAndMd5Internal(
-      const std::string& resource_id,
-      const std::string& md5,
-      const FilePath& gdata_file_path,
-      const GetFileFromCacheCallback& callback);
-
   // Wrapper task around any sequenced task that runs on IO thread pool that
   // makes sure |in_shutdown_| and |on_io_completed_| are handled properly in
   // the right order.
   void RunTaskOnIOThreadPool(const base::Closure& task);
 
   // Wrapper around BrowserThread::PostTask to post
   // RunTaskOnIOThreadPool task to the blocking thread pool.
   // TODO(satorux): As of now, it's posting to FILE thread.
   void PostBlockingPoolSequencedTask(
       const std::string& sequence_token_name,
@@ skipping 86 matching lines @@
 };
 
 // Sets the free disk space getter for testing.
 // The existing getter is deleted.
 void SetFreeDiskSpaceGetterForTesting(
     FreeDiskSpaceGetterInterface* getter);
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_