diff options
31 files changed, 69 insertions, 29 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index c663fb9..2a0e8a7 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -57,6 +57,11 @@ 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 1b04dee..b51c48f 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 4b466e2..ea2050c 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 628dc77..bc4758c 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 12ad3d3..5204c4c 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 71dd2fa..7a13629 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 0e349a4..7228d61 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/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/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 bcfbd88..a6e60c8 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 06b6109..b792dc6 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -431,6 +431,7 @@ '../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', @@ -458,7 +459,6 @@ '../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/fileapi/file_system_mount_point_provider.h b/webkit/browser/fileapi/file_system_mount_point_provider.h index 35ca09c..d8aff2b 100644 --- a/webkit/fileapi/file_system_mount_point_provider.h +++ b/webkit/browser/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_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ -#define WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ +#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ +#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ #include <string> #include <vector> @@ -174,4 +174,4 @@ class ExternalFileSystemMountPointProvider } // namespace fileapi -#endif // WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ +#endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc index 516cdb4..3995545 100644 --- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc +++ b/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc @@ -102,7 +102,8 @@ 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/browser/fileapi/webkit_browser_fileapi.gypi b/webkit/browser/fileapi/webkit_browser_fileapi.gypi new file mode 100644 index 0000000..714257f --- /dev/null +++ b/webkit/browser/fileapi/webkit_browser_fileapi.gypi @@ -0,0 +1,11 @@ +# 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 new file mode 100644 index 0000000..3bd1e90 --- /dev/null +++ b/webkit/browser/webkit_browser.gypi @@ -0,0 +1,16 @@ +# 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 698825a..376669c 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/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/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 4aaf87a..0870370 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 a8e8315..b334136 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 407bf83..06a638f 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/fileapi/isolated_mount_point_provider.h b/webkit/fileapi/isolated_mount_point_provider.h index bc8ce6d..75258d9 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/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/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 a4f6887..487a16f 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 27fc1f8..80c2769 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 f2b6cbb..346d109 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 d08cc49..7a91b59 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 669d431..39f9016 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 cbcc2d8..2c78267 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 4920c9b..91d1938 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/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/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 629eece..cca5cda 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/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/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 32c50c7..1182f26 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 8a71b77..1fcbd7d 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 ddf78a1..894f1ce 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 a84192c..bcc6b97 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -10,6 +10,10 @@ '../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': [ { @@ -37,6 +41,9 @@ '<@(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 8b23259..03f69192 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" |