Revert 137657 - Remove directory_path argument from chromeos::FindEntryCallback

chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

 // 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.
 
 #include <errno.h>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 940 matching lines @@
         false,     // load_from_server
         FilePath(FILE_PATH_LITERAL("drive")),
         base::Bind(&GDataFileSystemTest::OnExpectToFindEntry,
                    FilePath(FILE_PATH_LITERAL("drive"))));
     BrowserThread::GetBlockingPool()->FlushForTesting();
     message_loop_.RunAllPending();
   }
 
   static void OnExpectToFindEntry(const FilePath& search_file_path,
                                   base::PlatformFileError error,
+                                  const FilePath& directory_path,
                                   GDataEntry* entry) {
     ASSERT_TRUE(entry);
-    ASSERT_EQ(search_file_path, entry->GetFilePath());
+    if (entry->file_info().is_directory)
+      ASSERT_EQ(search_file_path, directory_path);
+    else
+      ASSERT_EQ(search_file_path, directory_path.Append(entry->file_name()));
   }
 
   static Value* LoadJSONFile(const std::string& filename) {
     FilePath path = GetTestFilePath(filename);
 
     std::string error;
     JSONFileValueSerializer serializer(path);
     Value* value = serializer.Deserialize(NULL, &error);
     EXPECT_TRUE(value) <<
         "Parse error " << path.value() << ": " << error;
@@ skipping 2677 matching lines @@
   EXPECT_EQ(1, num_callback_invocations_);
   EXPECT_TRUE(CacheEntryExists(resource_id, md5));
 
   // Try to remove the file.
   num_callback_invocations_ = 0;
   TestRemoveFromCache(resource_id, base::PLATFORM_FILE_OK);
   EXPECT_EQ(1, num_callback_invocations_);
 }
 
 }   // namespace gdata