Migrated sync_file_type and file_change from namespace fileapi to sync_file_system.

chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 127 matching lines @@
       FROM_HERE,
       base::Bind(arg5, error, base::Passed(&resource_list)));
 }
 
 ACTION(PrepareForRemoteChange_Busy) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(arg2,
                  fileapi::SYNC_STATUS_FILE_BUSY,
                  fileapi::SyncFileMetadata(),
-                 fileapi::FileChangeList()));
+                 FileChangeList()));
 }
 
 ACTION(PrepareForRemoteChange_NotFound) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(arg2,
                  fileapi::SYNC_STATUS_OK,
-                 fileapi::SyncFileMetadata(fileapi::SYNC_FILE_TYPE_UNKNOWN, 0,
+                 fileapi::SyncFileMetadata(SYNC_FILE_TYPE_UNKNOWN, 0,
                                            base::Time()),
-                 fileapi::FileChangeList()));
+                 FileChangeList()));
 }
 
 ACTION(PrepareForRemoteChange_NotModified) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(arg2,
                  fileapi::SYNC_STATUS_OK,
-                 fileapi::SyncFileMetadata(fileapi::SYNC_FILE_TYPE_FILE, 0,
+                 fileapi::SyncFileMetadata(SYNC_FILE_TYPE_FILE, 0,
                                            base::Time()),
-                 fileapi::FileChangeList()));
+                 FileChangeList()));
 }
 
 ACTION(InvokeDidDownloadFile) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(arg3, google_apis::HTTP_SUCCESS, arg1));
 }
 
 ACTION(InvokeDidApplyRemoteChange) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(arg3, fileapi::SYNC_STATUS_OK));
@@ skipping 98 matching lines @@
     profile_.reset();
     message_loop_.RunUntilIdle();
   }
 
   void SetSyncEnabled(bool enabled) {
     sync_service_->SetSyncEnabled(enabled);
   }
 
  protected:
   DriveFileSyncService::LocalSyncOperationType ResolveLocalSyncOperationType(
-      const fileapi::FileChange& local_change,
+      const FileChange& local_change,
       const fileapi::FileSystemURL& url) {
     return sync_service_->ResolveLocalSyncOperationType(local_change, url);
   }
 
   bool IsLocalSyncOperationAdd(
       DriveFileSyncService::LocalSyncOperationType type) {
     return type == DriveFileSyncService::LOCAL_SYNC_OPERATION_ADD;
   }
 
   bool IsLocalSyncOperationUpdate(
@@ skipping 18 matching lines @@
 
   bool IsLocalSyncOperationResolveToRemote(
       DriveFileSyncService::LocalSyncOperationType type) {
     return type == DriveFileSyncService::LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
   }
 
   void AddRemoteChange(int64 changestamp,
                        const std::string& resource_id,
                        const std::string& md5_checksum,
                        const fileapi::FileSystemURL& url,
-                       const fileapi::FileChange& file_change) {
+                       const FileChange& file_change) {
     typedef DriveFileSyncService::PendingChangeQueue::iterator iterator;
     typedef DriveFileSyncService::ChangeQueueItem ChangeQueueItem;
     typedef DriveFileSyncService::RemoteSyncType RemoteSyncType;
     sync_service_->pending_changes_.clear();
 
     RemoteSyncType sync_type = DriveFileSyncService::REMOTE_SYNC_TYPE_BATCH;
     std::pair<iterator, bool> inserted_to_queue =
         sync_service_->pending_changes_.insert(
             ChangeQueueItem(changestamp, sync_type, url));
     DCHECK(inserted_to_queue.second);
@@ skipping 425 matching lines @@
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(1);
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   SetUpDriveSyncService(true);
   message_loop()->RunUntilIdle();
 
-  const fileapi::FileChange local_add_or_update_change(
-      fileapi::FileChange::FILE_CHANGE_ADD_OR_UPDATE,
-      fileapi::SYNC_FILE_TYPE_FILE);
-  const fileapi::FileChange local_delete_change(
-      fileapi::FileChange::FILE_CHANGE_DELETE,
-      fileapi::SYNC_FILE_TYPE_FILE);
+  const FileChange local_add_or_update_change(
+      FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE);
+  const FileChange local_delete_change(
+      FileChange::FILE_CHANGE_DELETE, SYNC_FILE_TYPE_FILE);
 
   // There is no pending remote change and no metadata in DriveMetadataStore.
   EXPECT_TRUE(IsLocalSyncOperationAdd(
       ResolveLocalSyncOperationType(local_add_or_update_change, url)));
   EXPECT_TRUE(IsLocalSyncOperationNone(
       ResolveLocalSyncOperationType(local_delete_change, url)));
 
   // Add metadata for the file identified by |url|.
   DriveMetadata metadata;
   metadata.set_resource_id(kResourceId);
   metadata.set_md5_checksum("654321");
   metadata.set_conflicted(false);
   metadata.set_to_be_fetched(false);
   metadata_store()->UpdateEntry(url, metadata,
                                 base::Bind(&DidUpdateEntry));
 
   message_loop()->RunUntilIdle();
 
   // There is no pending remote change, but metadata in DriveMetadataStore.
   EXPECT_TRUE(IsLocalSyncOperationUpdate(
       ResolveLocalSyncOperationType(local_add_or_update_change, url)));
   EXPECT_TRUE(IsLocalSyncOperationDelete(
       ResolveLocalSyncOperationType(local_delete_change, url)));
 
   // Add an ADD_OR_UPDATE change for the file to the pending change queue.
   AddRemoteChange(
       kChangestamp, kResourceId, "hoge", url,
-      fileapi::FileChange(fileapi::FileChange::FILE_CHANGE_ADD_OR_UPDATE,
-                          fileapi::SYNC_FILE_TYPE_FILE));
+      FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE));
 
   EXPECT_TRUE(IsLocalSyncOperationConflict(
       ResolveLocalSyncOperationType(local_add_or_update_change, url)));
   EXPECT_TRUE(IsLocalSyncOperationNone(
       ResolveLocalSyncOperationType(local_delete_change, url)));
 
   // Add a DELETE change for the file to the pending change queue.
   AddRemoteChange(
       kChangestamp, kResourceId, "fuga", url,
-      fileapi::FileChange(fileapi::FileChange::FILE_CHANGE_DELETE,
-                          fileapi::SYNC_FILE_TYPE_FILE));
+      FileChange(FileChange::FILE_CHANGE_DELETE, SYNC_FILE_TYPE_FILE));
 
   EXPECT_TRUE(IsLocalSyncOperationAdd(
       ResolveLocalSyncOperationType(local_add_or_update_change, url)));
   EXPECT_TRUE(IsLocalSyncOperationNone(
       ResolveLocalSyncOperationType(local_delete_change, url)));
 
   // Mark the file as conflicted so that the conflict resolution will occur.
   metadata.set_conflicted(true);
   metadata_store()->UpdateEntry(url, metadata,
                                 base::Bind(&DidUpdateEntry));
@@ skipping 249 matching lines @@
       kOrigin, kFilePath, true /* is_deleted */,
       kFileResourceId2, 7, "deleted_file_md5"));
   EXPECT_TRUE(AppendIncrementalRemoteChange(
       kOrigin, kFilePath, false /* is_deleted */,
       kFileResourceId, 8, "updated_file_md5"));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system