Migrated sync_file_status, sync_action and sync_direction from fileapi:: namespace to sync_file_sys…

chrome/browser/sync_file_system/sync_file_system_service_unittest.cc

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 5f017aaee094e7491aaed2cbb9cc58e8977c68dc..f3e3aea58fdbeb75ad0e31e5d79ec9163cd9ecba 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
@@ -50,8 +50,8 @@ template <typename R> struct AssignTrait {
   typedef const R& ArgumentType;
 };
 
-template <> struct AssignTrait<fileapi::SyncFileStatus> {
-  typedef fileapi::SyncFileStatus ArgumentType;
+template <> struct AssignTrait<SyncFileStatus> {
+  typedef SyncFileStatus ArgumentType;
 };
 
 template <typename R>
@@ -88,9 +88,9 @@ class MockSyncEventObserver : public SyncEventObserver {
                     const std::string& description));
   MOCK_METHOD4(OnFileSynced,
                void(const fileapi::FileSystemURL& url,
-                    fileapi::SyncFileStatus status,
-                    fileapi::SyncAction action,
-                    fileapi::SyncDirection direction));
+                    SyncFileStatus status,
+                    SyncAction action,
+                    SyncDirection direction));
 };
 
 ACTION_P3(NotifyStateAndCallback,
@@ -419,7 +419,7 @@ TEST_F(SyncFileSystemServiceTest, GetFileSyncStatus) {
   const FileSystemURL kFile(file_system_->URL("foo"));
 
   fileapi::SyncStatusCode status;
-  fileapi::SyncFileStatus sync_file_status;
+  SyncFileStatus sync_file_status;
 
   // 1. The file is not in conflicting nor in pending change state.
   {
@@ -428,15 +428,15 @@ TEST_F(SyncFileSystemServiceTest, GetFileSyncStatus) {
         .WillOnce(Return(false));
 
     status = fileapi::SYNC_STATUS_UNKNOWN;
-    sync_file_status = fileapi::SYNC_FILE_STATUS_UNKNOWN;
+    sync_file_status = SYNC_FILE_STATUS_UNKNOWN;
     sync_service_->GetFileSyncStatus(
         kFile,
-        base::Bind(&AssignValueAndQuit<fileapi::SyncFileStatus>,
+        base::Bind(&AssignValueAndQuit<SyncFileStatus>,
                    &run_loop, &status, &sync_file_status));
     run_loop.Run();
 
     EXPECT_EQ(fileapi::SYNC_STATUS_OK, status);
-    EXPECT_EQ(fileapi::SYNC_FILE_STATUS_SYNCED, sync_file_status);
+    EXPECT_EQ(SYNC_FILE_STATUS_SYNCED, sync_file_status);
   }
 
   // 2. Conflicting case.
@@ -446,15 +446,15 @@ TEST_F(SyncFileSystemServiceTest, GetFileSyncStatus) {
         .WillOnce(Return(true));
 
     status = fileapi::SYNC_STATUS_UNKNOWN;
-    sync_file_status = fileapi::SYNC_FILE_STATUS_UNKNOWN;
+    sync_file_status = SYNC_FILE_STATUS_UNKNOWN;
     sync_service_->GetFileSyncStatus(
         kFile,
-        base::Bind(&AssignValueAndQuit<fileapi::SyncFileStatus>,
+        base::Bind(&AssignValueAndQuit<SyncFileStatus>,
                    &run_loop, &status, &sync_file_status));
     run_loop.Run();
 
     EXPECT_EQ(fileapi::SYNC_STATUS_OK, status);
-    EXPECT_EQ(fileapi::SYNC_FILE_STATUS_CONFLICTING, sync_file_status);
+    EXPECT_EQ(SYNC_FILE_STATUS_CONFLICTING, sync_file_status);
   }
 
   // 3. The file has pending local changes.
@@ -466,15 +466,15 @@ TEST_F(SyncFileSystemServiceTest, GetFileSyncStatus) {
         .WillOnce(Return(false));
 
     status = fileapi::SYNC_STATUS_UNKNOWN;
-    sync_file_status = fileapi::SYNC_FILE_STATUS_UNKNOWN;
+    sync_file_status = SYNC_FILE_STATUS_UNKNOWN;
     sync_service_->GetFileSyncStatus(
         kFile,
-        base::Bind(&AssignValueAndQuit<fileapi::SyncFileStatus>,
+        base::Bind(&AssignValueAndQuit<SyncFileStatus>,
                    &run_loop, &status, &sync_file_status));
     run_loop.Run();
 
     EXPECT_EQ(fileapi::SYNC_STATUS_OK, status);
-    EXPECT_EQ(fileapi::SYNC_FILE_STATUS_HAS_PENDING_CHANGES, sync_file_status);
+    EXPECT_EQ(SYNC_FILE_STATUS_HAS_PENDING_CHANGES, sync_file_status);
   }
 
   // 4. The file has a conflict and pending local changes. In this case
@@ -487,15 +487,15 @@ TEST_F(SyncFileSystemServiceTest, GetFileSyncStatus) {
         .WillOnce(Return(true));
 
     status = fileapi::SYNC_STATUS_UNKNOWN;
-    sync_file_status = fileapi::SYNC_FILE_STATUS_UNKNOWN;
+    sync_file_status = SYNC_FILE_STATUS_UNKNOWN;
     sync_service_->GetFileSyncStatus(
         kFile,
-        base::Bind(&AssignValueAndQuit<fileapi::SyncFileStatus>,
+        base::Bind(&AssignValueAndQuit<SyncFileStatus>,
                    &run_loop, &status, &sync_file_status));
     run_loop.Run();
 
     EXPECT_EQ(fileapi::SYNC_STATUS_OK, status);
-    EXPECT_EQ(fileapi::SYNC_FILE_STATUS_CONFLICTING, sync_file_status);
+    EXPECT_EQ(SYNC_FILE_STATUS_CONFLICTING, sync_file_status);
   }
 }