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

chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h"
 #include "chrome/browser/sync_file_system/file_status_observer.h"
 #include "chrome/browser/sync_file_system/local_change_processor.h"
 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h"
 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
 #include "chrome/browser/sync_file_system/sync_status_code.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/test/base/test_switches.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/quota/quota_manager.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/quota/quota_manager.h"
 
 using ::testing::_;
 using ::testing::Eq;
 using ::testing::Ne;
 using ::testing::Property;
 using ::testing::Return;
-using fileapi::FileSystemURL;
+using storage::FileSystemURL;
 using sync_file_system::MockRemoteFileSyncService;
 using sync_file_system::RemoteFileSyncService;
 using sync_file_system::SyncFileSystemServiceFactory;
 
 namespace {
 
 class SyncFileSystemApiTest : public ExtensionApiTest {
  public:
   SyncFileSystemApiTest()
       : mock_remote_service_(NULL),
@@ skipping 144 matching lines @@
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetServiceStatus) {
   mock_remote_service()->SetServiceState(
       sync_file_system::REMOTE_SERVICE_AUTHENTICATION_REQUIRED);
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_service_status"))
       << message_;
 }