Index: chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc |
=================================================================== |
--- chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc (revision 137657) |
+++ chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc (working copy) |
@@ -958,9 +958,13 @@ |
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) { |