Index: chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc |
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc |
index 2ca13a128cd135b76436f3f1e4d14ac7c550fd4a..e32aad1e6084785c4790ded2ca17b83c3d38b754 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc |
+++ b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc |
@@ -327,10 +327,8 @@ class GDataFileSystemTest : public testing::Test { |
} |
GDataEntry* FindEntry(const FilePath& file_path) { |
- GDataEntry* entry = NULL; |
- file_system_->root_->FindEntryByPath( |
- file_path, base::Bind(&ReadOnlyFindEntryCallback, &entry)); |
- return entry; |
+ base::AutoLock lock(file_system_->lock_); |
+ return file_system_->GetGDataEntryByPath(file_path); |
} |
void FindAndTestFilePath(const FilePath& file_path) { |
@@ -340,10 +338,8 @@ class GDataFileSystemTest : public testing::Test { |
} |
GDataEntry* FindEntryByResourceId(const std::string& resource_id) { |
- GDataEntry* entry = NULL; |
- file_system_->FindEntryByResourceIdSync( |
- resource_id, base::Bind(&ReadOnlyFindEntryCallback, &entry)); |
- return entry; |
+ GDataEntry* entry = file_system_->root_->GetEntryByResourceId(resource_id); |
+ return entry ? entry->AsGDataFile() : NULL; |
} |
// Gets the entry info for |file_path| and compares the contents against |