Index: chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
diff --git a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
index 2171858432b2deed6956864b46084a1d1f6ad724..4b495a1e249943fe2dfc74bbc8d953025832e804 100644 |
--- a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
+++ b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
@@ -115,7 +115,7 @@ class LocalFileChangeTrackerTest : public testing::Test { |
}; |
TEST_F(LocalFileChangeTrackerTest, GetChanges) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
// Test URLs (no parent/child relationships, as we test such cases |
// mainly in LocalFileSyncStatusTest). |
@@ -230,7 +230,7 @@ TEST_F(LocalFileChangeTrackerTest, GetChanges) { |
} |
TEST_F(LocalFileChangeTrackerTest, RestoreCreateAndModifyChanges) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
FileSystemURLSet urls; |
@@ -248,17 +248,17 @@ TEST_F(LocalFileChangeTrackerTest, RestoreCreateAndModifyChanges) { |
ScopedTextBlob blob(url_request_context, "blob_id:test", kData); |
// Create files and nested directories. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath0))); // Creates a file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath1))); // Creates a dir. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath2))); // Creates another dir. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath3))); // Creates a file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.TruncateFile(URL(kPath3), 1)); // Modifies the file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath4))); // Creates another file. |
EXPECT_EQ(static_cast<int64>(kData.size()), // Modifies the file. |
file_system_.Write(&url_request_context, |
@@ -299,7 +299,7 @@ TEST_F(LocalFileChangeTrackerTest, RestoreCreateAndModifyChanges) { |
} |
TEST_F(LocalFileChangeTrackerTest, RestoreRemoveChanges) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
FileSystemURLSet urls; |
@@ -314,27 +314,27 @@ TEST_F(LocalFileChangeTrackerTest, RestoreRemoveChanges) { |
ASSERT_EQ(0U, urls.size()); |
// Creates and removes a same file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath0))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Remove(URL(kPath0), false /* recursive */)); |
// Creates and removes a same directory. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath1))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Remove(URL(kPath1), false /* recursive */)); |
// Creates files and nested directories, then removes the parent directory. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath2))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath3))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath4))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath5))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Remove(URL(kPath2), true /* recursive */)); |
file_system_.GetChangedURLsInTracker(&urls); |
@@ -375,7 +375,7 @@ TEST_F(LocalFileChangeTrackerTest, RestoreRemoveChanges) { |
} |
TEST_F(LocalFileChangeTrackerTest, RestoreCopyChanges) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
FileSystemURLSet urls; |
@@ -399,17 +399,17 @@ TEST_F(LocalFileChangeTrackerTest, RestoreCopyChanges) { |
ScopedTextBlob blob(url_request_context, "blob_id:test", kData); |
// Create files and nested directories. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath0))); // Creates a file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath1))); // Creates a dir. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath2))); // Creates another dir. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath3))); // Creates a file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.TruncateFile(URL(kPath3), 1)); // Modifies the file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath4))); // Creates another file. |
EXPECT_EQ(static_cast<int64>(kData.size()), |
file_system_.Write(&url_request_context, // Modifies the file. |
@@ -429,9 +429,9 @@ TEST_F(LocalFileChangeTrackerTest, RestoreCopyChanges) { |
EXPECT_TRUE(urls.empty()); |
// Copy the file and the parent directory. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Copy(URL(kPath0), URL(kPath0Copy))); // Copy the file. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Copy(URL(kPath1), URL(kPath1Copy))); // Copy the dir. |
file_system_.GetChangedURLsInTracker(&urls); |
@@ -466,7 +466,7 @@ TEST_F(LocalFileChangeTrackerTest, RestoreCopyChanges) { |
} |
TEST_F(LocalFileChangeTrackerTest, RestoreMoveChanges) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
FileSystemURLSet urls; |
@@ -486,15 +486,15 @@ TEST_F(LocalFileChangeTrackerTest, RestoreMoveChanges) { |
ASSERT_EQ(0U, urls.size()); |
// Create files and nested directories. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath0))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath1))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath2))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath3))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath4))); |
// Verify we have 5 changes for preparation. |
@@ -511,9 +511,9 @@ TEST_F(LocalFileChangeTrackerTest, RestoreMoveChanges) { |
EXPECT_TRUE(urls.empty()); |
// Move the file and the parent directory. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Move(URL(kPath0), URL(kPath5))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Move(URL(kPath1), URL(kPath6))); |
file_system_.GetChangedURLsInTracker(&urls); |
@@ -560,7 +560,7 @@ TEST_F(LocalFileChangeTrackerTest, RestoreMoveChanges) { |
} |
TEST_F(LocalFileChangeTrackerTest, NextChangedURLsWithRecursiveCopy) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
FileSystemURLSet urls; |
@@ -573,13 +573,13 @@ TEST_F(LocalFileChangeTrackerTest, NextChangedURLsWithRecursiveCopy) { |
const char kPath2Copy[] = "dir b/dir"; |
// Creates kPath0,1,2 and then copies them all. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath0))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath1))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath2))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Copy(URL(kPath0), URL(kPath0Copy))); |
std::deque<FileSystemURL> urls_to_process; |
@@ -601,20 +601,20 @@ TEST_F(LocalFileChangeTrackerTest, NextChangedURLsWithRecursiveCopy) { |
} |
TEST_F(LocalFileChangeTrackerTest, NextChangedURLsWithRecursiveRemove) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
const char kPath0[] = "dir a"; |
const char kPath1[] = "dir a/file1"; |
const char kPath2[] = "dir a/file2"; |
// Creates kPath0,1,2 and then removes them all. |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath0))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath1))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath2))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.Remove(URL(kPath0), true /* recursive */)); |
FileSystemURLSet urls; |
@@ -638,20 +638,20 @@ TEST_F(LocalFileChangeTrackerTest, NextChangedURLsWithRecursiveRemove) { |
} |
TEST_F(LocalFileChangeTrackerTest, ResetForFileSystem) { |
- EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); |
+ EXPECT_EQ(base::File::FILE_OK, file_system_.OpenFileSystem()); |
const char kPath0[] = "dir a"; |
const char kPath1[] = "dir a/file"; |
const char kPath2[] = "dir a/subdir"; |
const char kPath3[] = "dir b"; |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath0))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateFile(URL(kPath1))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath2))); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, |
+ EXPECT_EQ(base::File::FILE_OK, |
file_system_.CreateDirectory(URL(kPath3))); |
FileSystemURLSet urls; |