Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: webkit/fileapi/isolated_file_util_unittest.cc

Issue 14671020: FileAPI: Copy base::FileUtilProxy::Entry to fileapi::DirectoryEntry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win build and remove base/ change Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/fileapi/file_system_operation.h ('k') | webkit/fileapi/local_file_system_operation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/isolated_file_util_unittest.cc
diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc
index 7452a31dcdf034bf50c26ff2007b058c23f54be0..8bef3bf6ab1ecda9ca8ee03ce088bd5dd41df3fa 100644
--- a/webkit/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/fileapi/isolated_file_util_unittest.cc
@@ -360,8 +360,7 @@ TEST_F(IsolatedFileUtilTest, ReadDirectoryTest) {
<< ": " << test_case.path);
// Read entries in the directory to construct the expected results map.
- typedef std::map<base::FilePath::StringType,
- base::FileUtilProxy::Entry> EntryMap;
+ typedef std::map<base::FilePath::StringType, DirectoryEntry> EntryMap;
EntryMap expected_entry_map;
base::FilePath dir_path = GetTestCasePlatformPath(test_case.path);
@@ -372,7 +371,7 @@ TEST_F(IsolatedFileUtilTest, ReadDirectoryTest) {
while (!(current = file_enum.Next()).empty()) {
FileEnumerator::FindInfo file_info;
file_enum.GetFindInfo(&file_info);
- base::FileUtilProxy::Entry entry;
+ DirectoryEntry entry;
entry.is_directory = FileEnumerator::IsDirectory(file_info);
entry.name = current.BaseName().value();
entry.size = FileEnumerator::GetFilesize(file_info);
@@ -399,7 +398,7 @@ TEST_F(IsolatedFileUtilTest, ReadDirectoryTest) {
EXPECT_EQ(expected_entry_map.size(), entries.size());
for (size_t i = 0; i < entries.size(); ++i) {
- const base::FileUtilProxy::Entry& entry = entries[i];
+ const DirectoryEntry& entry = entries[i];
EntryMap::iterator found = expected_entry_map.find(entry.name);
EXPECT_TRUE(found != expected_entry_map.end());
EXPECT_EQ(found->second.name, entry.name);
« no previous file with comments | « webkit/fileapi/file_system_operation.h ('k') | webkit/fileapi/local_file_system_operation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698