gdata: Remove GDataFileSystem::GetFileFromCacheByResourceIdAndMd5Internal()

In favor of less indirection.
Along the way, remove an unsed parameter gdata_file_path from some places.

BUG=chromium-os:29813
TEST=compiles

Review URL: https://chromiumcodereview.appspot.com/10182012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133544 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/gdata/gdata_file_system.cc

@@ -499,13 +499,12 @@ void RunGetFileFromCacheCallbackHelper(
     base::PlatformFileError* error,
     const std::string& resource_id,
     const std::string& md5,
-    const FilePath& gdata_file_path,
     FilePath* cache_file_path) {
   DCHECK(error);
   DCHECK(cache_file_path);
 
   if (!callback.is_null())
-    callback.Run(*error, resource_id, md5, gdata_file_path, *cache_file_path);
+    callback.Run(*error, resource_id, md5, *cache_file_path);
 }
 
 void RunGetCacheStateCallbackHelper(
@@ -1761,7 +1760,6 @@ void GDataFileSystem::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) {
   // Have we found the file in cache? If so, return it back to the caller.
   if (error == base::PLATFORM_FILE_OK) {
@@ -3227,14 +3225,6 @@ FilePath GDataFileSystem::GetCacheFilePath(
   return cache_paths_[sub_dir_type].Append(base_name);
 }
 
-void GDataFileSystem::GetFileFromCacheByResourceIdAndMd5(
-    const std::string& resource_id,
-    const std::string& md5,
-    const GetFileFromCacheCallback& callback) {
-  GetFileFromCacheByResourceIdAndMd5Internal(
-      resource_id, md5, FilePath(), callback);
-}
-
 void GDataFileSystem::StoreToCache(const std::string& resource_id,
                                    const std::string& md5,
                                    const FilePath& source_path,
@@ -3333,7 +3323,6 @@ void GDataFileSystem::MarkDirtyInCache(
                  base::Owned(error),
                  resource_id,
                  md5,
-                 FilePath() /* gdata_file_path */,
                  base::Owned(cache_file_path)));
 }
 
@@ -3453,7 +3442,6 @@ void GDataFileSystem::InitializeCacheOnIOThreadPool() {
 void GDataFileSystem::GetFileFromCacheOnIOThreadPool(
     const std::string& resource_id,
     const std::string& md5,
-    const FilePath& gdata_file_path,
     base::PlatformFileError* error,
     FilePath* cache_file_path) {
   DCHECK(error);
@@ -4231,10 +4219,9 @@ void GDataFileSystem::ScanCacheDirectory(
   }
 }
 
-void GDataFileSystem::GetFileFromCacheByResourceIdAndMd5Internal(
+void GDataFileSystem::GetFileFromCacheByResourceIdAndMd5(
     const std::string& resource_id,
     const std::string& md5,
-    const FilePath& gdata_file_path,
     const GetFileFromCacheCallback& callback) {
   InitializeCacheIfNecessary();
 
@@ -4248,7 +4235,6 @@ void GDataFileSystem::GetFileFromCacheByResourceIdAndMd5Internal(
                  base::Unretained(this),
                  resource_id,
                  md5,
-                 gdata_file_path,
                  error,
                  cache_file_path),
       base::Bind(&RunGetFileFromCacheCallbackHelper,
@@ -4256,7 +4242,6 @@ void GDataFileSystem::GetFileFromCacheByResourceIdAndMd5Internal(
                  base::Owned(error),
                  resource_id,
                  md5,
-                 gdata_file_path,
                  base::Owned(cache_file_path)));
 }
 

chrome/browser/chromeos/gdata/gdata_file_system.h

@@ -56,7 +56,6 @@ typedef base::Callback<void(base::PlatformFileError error,
 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;
 
@@ -1109,7 +1108,6 @@ class GDataFileSystem : public GDataFileSystemInterface,
   void GetFileFromCacheOnIOThreadPool(
       const std::string& resource_id,
       const std::string& md5,
-      const FilePath& gdata_file_path,
       base::PlatformFileError* error,
       FilePath* cache_file_path);
 
@@ -1215,12 +1213,11 @@ class GDataFileSystem : public GDataFileSystemInterface,
 
   // 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
@@ -1250,14 +1247,6 @@ class GDataFileSystem : public GDataFileSystemInterface,
       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.

chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

@@ -367,7 +367,6 @@ class GDataFileSystemTest : public testing::Test {
   void VerifyGetFromCache(base::PlatformFileError error,
                           const std::string& resource_id,
                           const std::string& md5,
-                          const FilePath& gdata_file_path,
                           const FilePath& cache_file_path) {
     ++num_callback_invocations_;
 
@@ -575,7 +574,6 @@ class GDataFileSystemTest : public testing::Test {
   void VerifyMarkDirty(base::PlatformFileError error,
                        const std::string& resource_id,
                        const std::string& md5,
-                       const FilePath& gdata_file_path,
                        const FilePath& cache_file_path) {
     VerifyCacheFileState(error, resource_id, md5);