diff options
31 files changed, 29 insertions, 69 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 2a0e8a7..c663fb9 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -57,11 +57,6 @@ include_rules = [ "+webkit/plugins", # Defines some types that are marshalled over IPC. "+webkit/quota", "+webkit/user_agent", - - # TODO(kinuko): Remove all other webkit/* dependencies after we cleaned - # up webkit/. crbug.com/239710 - "+webkit/browser", - # webkit/glue files are listed individually since they aren't conceptually # grouped like the other webkit/ files, and can therefore be tackled one at # a time. diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc index b51c48f..1b04dee 100644 --- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc @@ -10,9 +10,9 @@ #include "base/utf_string_conversions.h" #include "chrome/test/base/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/isolated_context.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc index ea2050c..4b466e2 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc @@ -51,8 +51,8 @@ #include "content/public/browser/storage_partition.h" #include "googleurl/src/gurl.h" #include "ui/shell_dialogs/select_file_dialog.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" using content::BrowserContext; using content::BrowserThread; diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc index bc4758c..628dc77 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc @@ -13,8 +13,8 @@ #include "chromeos/disks/mock_disk_mount_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" using ::testing::_; using ::testing::ReturnRef; diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc index 5204c4c..12ad3d3 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc @@ -54,8 +54,8 @@ #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/screen.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 7a13629..71dd2fa 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -115,8 +115,8 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/extensions/install_limiter.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #endif using content::BrowserContext; diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h index 7228d61..0e349a4 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h +++ b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_file_system_config.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" namespace fileapi { class AsyncFileUtilAdapter; diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc index a6e60c8..bcfbd88 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc @@ -15,9 +15,9 @@ #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h" #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_url.h" diff --git a/content/content_tests.gypi b/content/content_tests.gypi index b792dc6..06b6109 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -431,7 +431,6 @@ '../webkit/appcache/mock_appcache_storage.cc', '../webkit/appcache/mock_appcache_storage.h', '../webkit/appcache/mock_appcache_storage_unittest.cc', - '../webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc', '../webkit/blob/blob_storage_context_unittest.cc', '../webkit/blob/blob_storage_controller_unittest.cc', '../webkit/blob/blob_url_request_job_unittest.cc', @@ -459,6 +458,7 @@ '../webkit/fileapi/file_system_context_unittest.cc', '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc', '../webkit/fileapi/file_system_file_stream_reader_unittest.cc', + '../webkit/fileapi/file_system_mount_point_provider_unittest.cc', '../webkit/fileapi/file_system_quota_client_unittest.cc', '../webkit/fileapi/file_system_url_request_job_unittest.cc', '../webkit/fileapi/file_system_url_unittest.cc', diff --git a/webkit/browser/fileapi/webkit_browser_fileapi.gypi b/webkit/browser/fileapi/webkit_browser_fileapi.gypi deleted file mode 100644 index 714257f..0000000 --- a/webkit/browser/fileapi/webkit_browser_fileapi.gypi +++ /dev/null @@ -1,11 +0,0 @@ -# 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. - -{ - 'variables': { - 'webkit_browser_fileapi_sources': [ - '../browser/fileapi/file_system_mount_point_provider.h', - ], - }, -} diff --git a/webkit/browser/webkit_browser.gypi b/webkit/browser/webkit_browser.gypi deleted file mode 100644 index 3bd1e90..0000000 --- a/webkit/browser/webkit_browser.gypi +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -{ - 'includes': [ - '../browser/fileapi/webkit_browser_fileapi.gypi', - ], - # TODO(kinuko): Have webkit_browser target and deprecate old gypis like - # webkit_storage.gypi. - 'variables': { - 'webkit_browser_storage_sources': [ - '<@(webkit_browser_fileapi_sources)', - ], - }, -} diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.h b/webkit/chromeos/fileapi/cros_mount_point_provider.h index 376669c..698825a 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider.h +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.h @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/quota/special_storage_policy.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/async_file_test_helper.cc b/webkit/fileapi/async_file_test_helper.cc index 0870370..4aaf87a 100644 --- a/webkit/fileapi/async_file_test_helper.cc +++ b/webkit/fileapi/async_file_test_helper.cc @@ -5,9 +5,9 @@ #include "base/bind.h" #include "base/run_loop.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/quota/quota_manager.h" diff --git a/webkit/fileapi/copy_or_move_file_validator_unittest.cc b/webkit/fileapi/copy_or_move_file_validator_unittest.cc index b334136..a8e8315 100644 --- a/webkit/fileapi/copy_or_move_file_validator_unittest.cc +++ b/webkit/fileapi/copy_or_move_file_validator_unittest.cc @@ -8,11 +8,11 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/copy_or_move_file_validator.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/isolated_context.h" diff --git a/webkit/fileapi/file_system_context_unittest.cc b/webkit/fileapi/file_system_context_unittest.cc index 06a638f..407bf83 100644 --- a/webkit/fileapi/file_system_context_unittest.cc +++ b/webkit/fileapi/file_system_context_unittest.cc @@ -8,8 +8,8 @@ #include "base/message_loop.h" #include "base/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/isolated_context.h" #include "webkit/fileapi/mock_file_system_options.h" diff --git a/webkit/browser/fileapi/file_system_mount_point_provider.h b/webkit/fileapi/file_system_mount_point_provider.h index d8aff2b..35ca09c 100644 --- a/webkit/browser/fileapi/file_system_mount_point_provider.h +++ b/webkit/fileapi/file_system_mount_point_provider.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ -#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ +#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ +#define WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ #include <string> #include <vector> @@ -174,4 +174,4 @@ class ExternalFileSystemMountPointProvider } // namespace fileapi -#endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ +#endif // WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ diff --git a/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc index 3995545..516cdb4 100644 --- a/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc +++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc @@ -102,8 +102,7 @@ const struct CheckValidPathTest { }; // For External filesystem. -const base::FilePath::CharType kMountPoint[] = - FILE_PATH_LITERAL("/tmp/testing"); +const base::FilePath::CharType kMountPoint[] = FILE_PATH_LITERAL("/tmp/testing"); const base::FilePath::CharType kRootPath[] = FILE_PATH_LITERAL("/tmp"); const base::FilePath::CharType kVirtualPath[] = FILE_PATH_LITERAL("testing"); diff --git a/webkit/fileapi/isolated_mount_point_provider.h b/webkit/fileapi/isolated_mount_point_provider.h index 75258d9..bc8ce6d 100644 --- a/webkit/fileapi/isolated_mount_point_provider.h +++ b/webkit/fileapi/isolated_mount_point_provider.h @@ -6,7 +6,7 @@ #define WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_ #include "base/memory/scoped_ptr.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" namespace fileapi { diff --git a/webkit/fileapi/local_file_system_cross_operation_unittest.cc b/webkit/fileapi/local_file_system_cross_operation_unittest.cc index 487a16f..a4f6887 100644 --- a/webkit/fileapi/local_file_system_cross_operation_unittest.cc +++ b/webkit/fileapi/local_file_system_cross_operation_unittest.cc @@ -12,9 +12,9 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc index 80c2769..27fc1f8 100644 --- a/webkit/fileapi/local_file_system_operation.cc +++ b/webkit/fileapi/local_file_system_operation.cc @@ -11,12 +11,12 @@ #include "net/base/escape.h" #include "net/url_request/url_request_context.h" #include "webkit/blob/shareable_file_reference.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_util.h" #include "webkit/fileapi/cross_operation_delegate.h" #include "webkit/fileapi/file_observers.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/local_file_system_operation_unittest.cc b/webkit/fileapi/local_file_system_operation_unittest.cc index 346d109..f2b6cbb 100644 --- a/webkit/fileapi/local_file_system_operation_unittest.cc +++ b/webkit/fileapi/local_file_system_operation_unittest.cc @@ -15,10 +15,10 @@ #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/blob/shareable_file_reference.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/file_system_util.h" diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc index 7a91b59..d08cc49 100644 --- a/webkit/fileapi/local_file_util.cc +++ b/webkit/fileapi/local_file_util.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/files/file_util_proxy.h" #include "googleurl/src/gurl.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_url.h" diff --git a/webkit/fileapi/mock_file_system_context.cc b/webkit/fileapi/mock_file_system_context.cc index 39f9016..669d431 100644 --- a/webkit/fileapi/mock_file_system_context.cc +++ b/webkit/fileapi/mock_file_system_context.cc @@ -5,9 +5,9 @@ #include "webkit/fileapi/mock_file_system_context.h" #include "base/memory/scoped_vector.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/mock_file_system_options.h" #include "webkit/fileapi/test_mount_point_provider.h" diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc index 2c78267..cbcc2d8 100644 --- a/webkit/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_util_unittest.cc @@ -14,10 +14,10 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_usage_cache.h" diff --git a/webkit/fileapi/sandbox_mount_point_provider.h b/webkit/fileapi/sandbox_mount_point_provider.h index 91d1938..4920c9b 100644 --- a/webkit/fileapi/sandbox_mount_point_provider.h +++ b/webkit/fileapi/sandbox_mount_point_provider.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "googleurl/src/gurl.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_options.h" #include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/task_runner_bound_observer_list.h" diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc index cca5cda..629eece 100644 --- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc +++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc @@ -14,7 +14,7 @@ #include "base/message_loop_proxy.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/mock_file_system_options.h" diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.cc b/webkit/fileapi/syncable/canned_syncable_file_system.cc index 1182f26..32c50c7 100644 --- a/webkit/fileapi/syncable/canned_syncable_file_system.cc +++ b/webkit/fileapi/syncable/canned_syncable_file_system.cc @@ -13,9 +13,9 @@ #include "base/task_runner_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/blob/mock_blob_url_request_context.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/local_file_system_operation.h" diff --git a/webkit/fileapi/test_mount_point_provider.h b/webkit/fileapi/test_mount_point_provider.h index 1fcbd7d..8a71b77 100644 --- a/webkit/fileapi/test_mount_point_provider.h +++ b/webkit/fileapi/test_mount_point_provider.h @@ -8,8 +8,8 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_util_adapter.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/task_runner_bound_observer_list.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc b/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc index 894f1ce..ddf78a1 100644 --- a/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc +++ b/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc @@ -9,9 +9,9 @@ #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/mock_file_system_context.h" diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi index bcc6b97..a84192c 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -10,10 +10,6 @@ '../dom_storage/webkit_dom_storage.gypi', '../fileapi/webkit_fileapi.gypi', '../quota/webkit_quota.gypi', - - # TODO(kinuko): Deprecate this when we have a new target for - # webkit_browser. crbug.com/239710 - '../browser/webkit_browser.gypi', ], 'targets': [ { @@ -41,9 +37,6 @@ '<@(webkit_dom_storage_sources)', '<@(webkit_fileapi_sources)', '<@(webkit_quota_sources)', - # TODO(kinuko): Deprecate this when we have a new target for - # webkit_browser. crbug.com/239710 - '<@(webkit_browser_storage_sources)', ], 'conditions': [ ['chromeos==1', { diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc index 03f69192..8b23259 100644 --- a/webkit/tools/test_shell/simple_file_system.cc +++ b/webkit/tools/test_shell/simple_file_system.cc @@ -21,8 +21,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/blob/blob_storage_controller.h" -#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_permission_policy.h" +#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/mock_file_system_context.h" |