Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc

 // Copyright 2013 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_backend_v1/drive_file_sync_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 21 matching lines @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/id_util.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/gdata_errorcode.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 #define FPL(x) FILE_PATH_LITERAL(x)
 
 using ::testing::StrictMock;
@@ skipping 100 matching lines @@
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 
 class MockFileStatusObserver: public FileStatusObserver {
  public:
   MockFileStatusObserver() {}
   virtual ~MockFileStatusObserver() {}
 
   MOCK_METHOD4(OnFileStatusChanged,
-               void(const fileapi::FileSystemURL& url,
+               void(const storage::FileSystemURL& url,
                     SyncFileStatus sync_status,
                     SyncAction action_taken,
                     SyncDirection direction));
 };
 
 class DriveFileSyncServiceFakeTest : public testing::Test {
  public:
   DriveFileSyncServiceFakeTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         profile_manager_(TestingBrowserProcess::GetGlobal()),
@@ skipping 127 matching lines @@
 
   DriveFileSyncService* sync_service() { return sync_service_.get(); }
   std::map<GURL, std::string>* pending_batch_sync_origins() {
     return &(sync_service()->pending_batch_sync_origins_);
   }
 
   const RemoteChangeHandler& remote_change_handler() const {
     return sync_service_->remote_change_handler_;
   }
 
-  fileapi::FileSystemURL CreateURL(const GURL& origin,
+  storage::FileSystemURL CreateURL(const GURL& origin,
                                    const std::string& filename) {
     return CreateSyncableFileSystemURL(
         origin, base::FilePath::FromUTF8Unsafe(filename));
   }
 
   void ProcessRemoteChange(SyncStatusCode expected_status,
-                           const fileapi::FileSystemURL& expected_url,
+                           const storage::FileSystemURL& expected_url,
                            SyncFileStatus expected_sync_file_status,
                            SyncAction expected_sync_action,
                            SyncDirection expected_sync_direction) {
     SyncStatusCode actual_status = SYNC_STATUS_UNKNOWN;
-    fileapi::FileSystemURL actual_url;
+    storage::FileSystemURL actual_url;
 
     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);
     }
 
@@ skipping 230 matching lines @@
   // [5] Re-enable Extension 1. It moves back to batch and not to incremental.
   EnableExtension(ExtensionNameToId(kExtensionName1));
   UpdateRegisteredOrigins();
   VerifySizeOfRegisteredOrigins(1u, 0u, 0u);
 }
 
 void DriveFileSyncServiceFakeTest::TestRemoteChange_NoChange() {
   SetUpDriveSyncService(true);
 
   ProcessRemoteChange(SYNC_STATUS_NO_CHANGE_TO_SYNC,
-                      fileapi::FileSystemURL(),
+                      storage::FileSystemURL(),
                       SYNC_FILE_STATUS_UNKNOWN,
                       SYNC_ACTION_NONE,
                       SYNC_DIRECTION_NONE);
   VerifySizeOfRegisteredOrigins(0u, 0u, 0u);
   EXPECT_TRUE(!remote_change_handler().HasChanges());
 }
 
 void DriveFileSyncServiceFakeTest::TestRemoteChange_Busy() {
   const char kFileName[] = "File 1.txt";
   const GURL origin = ExtensionNameToGURL(kExtensionName1);
@@ skipping 266 matching lines @@
 }
 
 TEST_F(DriveFileSyncServiceFakeTest, RemoteChange_Folder_WAPI) {
   ScopedDisableDriveAPI disable_drive_api;
   TestRemoteChange_Folder();
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system