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

Unified Diff: chrome/browser/sync_file_system/sync_file_system_service_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 | « chrome/browser/sync_file_system/remote_change_processor.h ('k') | webkit/fileapi/syncable/file_change.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
diff --git a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
index f3e3aea58fdbeb75ad0e31e5d79ec9163cd9ecba..236d7aaa17787cdcd8192940558b72a6317e6ddb 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
@@ -25,12 +25,12 @@
#include "webkit/fileapi/syncable/sync_status_code.h"
#include "webkit/fileapi/syncable/syncable_file_system_util.h"
-using fileapi::FileChange;
using fileapi::FileSystemURL;
using fileapi::FileSystemURLSet;
using fileapi::MockSyncStatusObserver;
using fileapi::SyncFileMetadata;
using fileapi::SyncStatusCode;
+using sync_file_system::FileChange;
using ::testing::AnyNumber;
using ::testing::AtLeast;
using ::testing::InSequence;
@@ -328,7 +328,7 @@ TEST_F(SyncFileSystemServiceTest, SimpleLocalSyncFlow) {
// The local_change_processor's ApplyLocalChange should be called once
// with ADD_OR_UPDATE change for TYPE_FILE.
const FileChange change(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
- fileapi::SYNC_FILE_TYPE_FILE);
+ SYNC_FILE_TYPE_FILE);
EXPECT_CALL(local_change_processor, ApplyLocalChange(change, _, kFile, _))
.WillOnce(MockStatusCallback(fileapi::SYNC_STATUS_OK));
« no previous file with comments | « chrome/browser/sync_file_system/remote_change_processor.h ('k') | webkit/fileapi/syncable/file_change.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698