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

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 182 matching lines @@
                     const std::string& description));
 };
 
 class MockFileStatusObserver: public FileStatusObserver {
  public:
   MockFileStatusObserver() {}
   virtual ~MockFileStatusObserver() {}
 
   MOCK_METHOD4(OnFileStatusChanged,
                void(const fileapi::FileSystemURL& url,
-                    fileapi::SyncFileStatus sync_status,
-                    fileapi::SyncAction action_taken,
-                    fileapi::SyncDirection direction));
+                    SyncFileStatus sync_status,
+                    SyncAction action_taken,
+                    SyncDirection direction));
 };
 
 class DriveFileSyncServiceTest : public testing::Test {
  public:
   DriveFileSyncServiceTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_),
         mock_drive_service_(NULL) {
   }
 
@@ skipping 167 matching lines @@
   }
 
   fileapi::FileSystemURL CreateURL(const GURL& origin,
                                    const base::FilePath::StringType& path) {
     return fileapi::CreateSyncableFileSystemURL(
         origin, kServiceName, base::FilePath(path));
   }
 
   void ProcessRemoteChange(fileapi::SyncStatusCode expected_status,
                            const fileapi::FileSystemURL& expected_url,
-                           fileapi::SyncFileStatus expected_sync_file_status,
-                           fileapi::SyncAction expected_sync_action,
-                           fileapi::SyncDirection expected_sync_direction) {
+                           SyncFileStatus expected_sync_file_status,
+                           SyncAction expected_sync_action,
+                           SyncDirection expected_sync_direction) {
     fileapi::SyncStatusCode actual_status = fileapi::SYNC_STATUS_UNKNOWN;
     fileapi::FileSystemURL actual_url;
 
-    if (expected_sync_file_status != fileapi::SYNC_FILE_STATUS_UNKNOWN) {
+    if (expected_sync_file_status != SYNC_FILE_STATUS_UNKNOWN) {
       EXPECT_CALL(*mock_file_status_observer(),
                   OnFileStatusChanged(expected_url,
                                       expected_sync_file_status,
                                       expected_sync_action,
                                       expected_sync_direction))
           .Times(1);
     }
 
     sync_service_->ProcessRemoteChange(
         mock_remote_processor(),
@@ skipping 430 matching lines @@
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   SetUpDriveSyncService(true);
 
   ProcessRemoteChange(fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC,
                       fileapi::FileSystemURL(),
-                      fileapi::SYNC_FILE_STATUS_UNKNOWN,
-                      fileapi::SYNC_ACTION_NONE,
-                      fileapi::SYNC_DIRECTION_NONE);
+                      SYNC_FILE_STATUS_UNKNOWN,
+                      SYNC_ACTION_NONE,
+                      SYNC_DIRECTION_NONE);
   EXPECT_TRUE(metadata_store()->batch_sync_origins().empty());
   EXPECT_TRUE(metadata_store()->incremental_sync_origins().empty());
   EXPECT_TRUE(pending_changes().empty());
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_Busy) {
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const base::FilePath::StringType kFileName(FPL("File 1.mp3"));
@@ skipping 17 matching lines @@
       .WillOnce(InvokeCompletionCallback());
 
   SetUpDriveSyncService(true);
 
   scoped_ptr<ResourceEntry> entry(ResourceEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
   AppendIncrementalRemoteChangeByEntry(kOrigin, *entry, 12345);
 
   ProcessRemoteChange(fileapi::SYNC_STATUS_FILE_BUSY,
                       CreateURL(kOrigin, kFileName),
-                      fileapi::SYNC_FILE_STATUS_UNKNOWN,
-                      fileapi::SYNC_ACTION_NONE,
-                      fileapi::SYNC_DIRECTION_NONE);
+                      SYNC_FILE_STATUS_UNKNOWN,
+                      SYNC_ACTION_NONE,
+                      SYNC_DIRECTION_NONE);
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_NewFile) {
   const GURL kOrigin = ExtensionNameToGURL(FPL("example1"));
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const base::FilePath::StringType kFileName(FPL("File 1.mp3"));
   const std::string kFileResourceId("file:2_file_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
@@ skipping 21 matching lines @@
       .WillOnce(InvokeDidApplyRemoteChange());
 
   SetUpDriveSyncService(true);
 
   scoped_ptr<ResourceEntry> entry(ResourceEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
   AppendIncrementalRemoteChangeByEntry(kOrigin, *entry, 12345);
 
   ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
                       CreateURL(kOrigin, kFileName),
-                      fileapi::SYNC_FILE_STATUS_SYNCED,
-                      fileapi::SYNC_ACTION_ADDED,
-                      fileapi::SYNC_DIRECTION_REMOTE_TO_LOCAL);
+                      SYNC_FILE_STATUS_SYNCED,
+                      SYNC_ACTION_ADDED,
+                      SYNC_DIRECTION_REMOTE_TO_LOCAL);
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_UpdateFile) {
   const GURL kOrigin = ExtensionNameToGURL(FPL("example1"));
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const base::FilePath::StringType kFileName(FPL("File 1.mp3"));
   const std::string kFileResourceId("file:2_file_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
@@ skipping 20 matching lines @@
               ApplyRemoteChange(_, _, CreateURL(kOrigin, kFileName), _))
       .WillOnce(InvokeDidApplyRemoteChange());
 
   SetUpDriveSyncService(true);
 
   scoped_ptr<ResourceEntry> entry(ResourceEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
   AppendIncrementalRemoteChangeByEntry(kOrigin, *entry, 12345);
   ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
                       CreateURL(kOrigin, kFileName),
-                      fileapi::SYNC_FILE_STATUS_SYNCED,
-                      fileapi::SYNC_ACTION_UPDATED,
-                      fileapi::SYNC_DIRECTION_REMOTE_TO_LOCAL);
+                      SYNC_FILE_STATUS_SYNCED,
+                      SYNC_ACTION_UPDATED,
+                      SYNC_DIRECTION_REMOTE_TO_LOCAL);
 }
 
 TEST_F(DriveFileSyncServiceTest, RegisterOriginWithSyncDisabled) {
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
 
   EXPECT_CALL(*mock_remote_observer(),
@@ skipping 87 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