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

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc
index 93b55e6c9dbec5fff4b50389c698442eaea2a724..7aed41784c5494271db6203e4fc30cfa04230342 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc
@@ -39,7 +39,7 @@
 #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"
@@ -160,7 +160,7 @@ class MockFileStatusObserver: public FileStatusObserver {
   virtual ~MockFileStatusObserver() {}
 
   MOCK_METHOD4(OnFileStatusChanged,
-               void(const fileapi::FileSystemURL& url,
+               void(const storage::FileSystemURL& url,
                     SyncFileStatus sync_status,
                     SyncAction action_taken,
                     SyncDirection direction));
@@ -308,19 +308,19 @@ class DriveFileSyncServiceFakeTest : public testing::Test {
     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(),
@@ -571,7 +571,7 @@ 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);