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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/fileapi/syncable/local_file_change_tracker_unittest.cc

Issue 12315004: Migrated sync_file_type and file_change from namespace fileapi to sync_file_system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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/syncable/local_file_change_tracker.cc ('k') | webkit/fileapi/syncable/local_file_sync_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/syncable/local_file_change_tracker_unittest.cc
diff --git a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc
index 6535131d7f94135df48f5fcf4f8447286d71d536..9b973bd9d743ef9e9c435d137482018a37b77c1b 100644
--- a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc
+++ b/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc
@@ -23,6 +23,8 @@
#include "webkit/fileapi/syncable/syncable_file_system_util.h"
#include "webkit/quota/quota_manager.h"
+using sync_file_system::FileChange;
+using sync_file_system::FileChangeList;
using webkit_blob::MockBlobURLRequestContext;
using webkit_blob::ScopedTextBlob;
@@ -169,19 +171,19 @@ TEST_F(LocalFileChangeTrackerTest, GetChanges) {
VerifyAndClearChange(URL(kPath1),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath2),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath3),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath4),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath5),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
}
TEST_F(LocalFileChangeTrackerTest, RestoreCreateAndModifyChanges) {
@@ -251,35 +253,35 @@ TEST_F(LocalFileChangeTrackerTest, RestoreCreateAndModifyChanges) {
VerifyAndClearChange(URL(kPath0),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath1),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath2),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath3),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath4),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath0Copy),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath1Copy),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath2Copy),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath3Copy),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath4Copy),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
}
TEST_F(LocalFileChangeTrackerTest, RestoreRemoveChanges) {
@@ -343,22 +345,22 @@ TEST_F(LocalFileChangeTrackerTest, RestoreRemoveChanges) {
VerifyAndClearChange(URL(kPath0),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath1),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath2),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath3),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath4),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath5),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
}
TEST_F(LocalFileChangeTrackerTest, RestoreMoveChanges) {
@@ -422,34 +424,34 @@ TEST_F(LocalFileChangeTrackerTest, RestoreMoveChanges) {
VerifyAndClearChange(URL(kPath0),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath1),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath2),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath3),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath4),
FileChange(FileChange::FILE_CHANGE_DELETE,
- SYNC_FILE_TYPE_UNKNOWN));
+ sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
VerifyAndClearChange(URL(kPath5),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath6),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath7),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
VerifyAndClearChange(URL(kPath8),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_DIRECTORY));
+ sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
VerifyAndClearChange(URL(kPath9),
FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- SYNC_FILE_TYPE_FILE));
+ sync_file_system::SYNC_FILE_TYPE_FILE));
}
TEST_F(LocalFileChangeTrackerTest, NextChangedURLsWithRecursiveCopy) {
« no previous file with comments | « webkit/fileapi/syncable/local_file_change_tracker.cc ('k') | webkit/fileapi/syncable/local_file_sync_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698