diff options
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/browser/database/database_quota_client.cc (renamed from webkit/database/database_quota_client.cc) | 6 | ||||
-rw-r--r-- | webkit/browser/database/database_quota_client.h (renamed from webkit/database/database_quota_client.h) | 6 | ||||
-rw-r--r-- | webkit/browser/database/database_quota_client_unittest.cc (renamed from webkit/database/database_quota_client_unittest.cc) | 6 | ||||
-rw-r--r-- | webkit/browser/database/database_tracker.cc (renamed from webkit/database/database_tracker.cc) | 8 | ||||
-rw-r--r-- | webkit/browser/database/database_tracker.h (renamed from webkit/database/database_tracker.h) | 8 | ||||
-rw-r--r-- | webkit/browser/database/database_tracker_unittest.cc (renamed from webkit/database/database_tracker_unittest.cc) | 2 | ||||
-rw-r--r-- | webkit/browser/database/database_util.cc (renamed from webkit/database/database_util.cc) | 6 | ||||
-rw-r--r-- | webkit/browser/database/database_util.h (renamed from webkit/database/database_util.h) | 6 | ||||
-rw-r--r-- | webkit/browser/database/database_util_unittest.cc (renamed from webkit/database/database_util_unittest.cc) | 2 | ||||
-rw-r--r-- | webkit/browser/database/databases_table.cc (renamed from webkit/database/databases_table.cc) | 2 | ||||
-rw-r--r-- | webkit/browser/database/databases_table.h (renamed from webkit/database/databases_table.h) | 6 | ||||
-rw-r--r-- | webkit/browser/database/databases_table_unittest.cc (renamed from webkit/database/databases_table_unittest.cc) | 2 | ||||
-rw-r--r-- | webkit/browser/database/vfs_backend.cc (renamed from webkit/database/vfs_backend.cc) | 2 | ||||
-rw-r--r-- | webkit/browser/database/vfs_backend.h (renamed from webkit/database/vfs_backend.h) | 6 | ||||
-rw-r--r-- | webkit/browser/database/webkit_browser_database.gypi | 20 | ||||
-rw-r--r-- | webkit/browser/webkit_browser.gypi | 2 | ||||
-rw-r--r-- | webkit/common/database/database_connections.cc (renamed from webkit/database/database_connections.cc) | 2 | ||||
-rw-r--r-- | webkit/common/database/database_connections.h (renamed from webkit/database/database_connections.h) | 6 | ||||
-rw-r--r-- | webkit/common/database/database_connections_unittest.cc (renamed from webkit/database/database_connections_unittest.cc) | 2 | ||||
-rw-r--r-- | webkit/common/database/webkit_common_database.gypi | 12 | ||||
-rw-r--r-- | webkit/common/webkit_common.gypi | 16 | ||||
-rw-r--r-- | webkit/database/webkit_database.gypi | 22 | ||||
-rw-r--r-- | webkit/dom_storage/dom_storage_area.cc | 2 | ||||
-rw-r--r-- | webkit/storage/webkit_storage.gypi | 4 | ||||
-rw-r--r-- | webkit/support/simple_database_system.cc | 4 | ||||
-rw-r--r-- | webkit/support/simple_database_system.h | 4 | ||||
-rw-r--r-- | webkit/support/test_webkit_platform_support.cc | 2 | ||||
-rw-r--r-- | webkit/support/webkit_support.gyp | 1 | ||||
-rw-r--r-- | webkit/tools/test_shell/simple_dom_storage_system.cc | 2 |
29 files changed, 98 insertions, 71 deletions
diff --git a/webkit/database/database_quota_client.cc b/webkit/browser/database/database_quota_client.cc index b76decc..a1ea780 100644 --- a/webkit/database/database_quota_client.cc +++ b/webkit/browser/database/database_quota_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/database/database_quota_client.h" +#include "webkit/browser/database/database_quota_client.h" #include <vector> @@ -15,8 +15,8 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "webkit/base/origin_url_conversions.h" -#include "webkit/database/database_tracker.h" -#include "webkit/database/database_util.h" +#include "webkit/browser/database/database_tracker.h" +#include "webkit/browser/database/database_util.h" using quota::QuotaClient; diff --git a/webkit/database/database_quota_client.h b/webkit/browser/database/database_quota_client.h index 2c14e1d..c90c0d5b 100644 --- a/webkit/database/database_quota_client.h +++ b/webkit/browser/database/database_quota_client.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_DATABASE_DATABASE_QUOTA_CLIENT_H_ -#define WEBKIT_DATABASE_DATABASE_QUOTA_CLIENT_H_ +#ifndef WEBKIT_BROWSER_DATABASE_DATABASE_QUOTA_CLIENT_H_ +#define WEBKIT_BROWSER_DATABASE_DATABASE_QUOTA_CLIENT_H_ #include <set> #include <string> @@ -52,4 +52,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE DatabaseQuotaClient } // namespace webkit_database -#endif // WEBKIT_DATABASE_DATABASE_QUOTA_CLIENT_H_ +#endif // WEBKIT_BROWSER_DATABASE_DATABASE_QUOTA_CLIENT_H_ diff --git a/webkit/database/database_quota_client_unittest.cc b/webkit/browser/database/database_quota_client_unittest.cc index ad99b17..8e508ac 100644 --- a/webkit/database/database_quota_client_unittest.cc +++ b/webkit/browser/database/database_quota_client_unittest.cc @@ -13,9 +13,9 @@ #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/base/origin_url_conversions.h" -#include "webkit/database/database_quota_client.h" -#include "webkit/database/database_tracker.h" -#include "webkit/database/database_util.h" +#include "webkit/browser/database/database_quota_client.h" +#include "webkit/browser/database/database_tracker.h" +#include "webkit/browser/database/database_util.h" namespace webkit_database { diff --git a/webkit/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc index e1fd706..effe322 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/browser/database/database_tracker.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/database/database_tracker.h" +#include "webkit/browser/database/database_tracker.h" #include <algorithm> #include <vector> @@ -20,9 +20,9 @@ #include "sql/transaction.h" #include "third_party/sqlite/sqlite3.h" #include "webkit/base/origin_url_conversions.h" -#include "webkit/database/database_quota_client.h" -#include "webkit/database/database_util.h" -#include "webkit/database/databases_table.h" +#include "webkit/browser/database/database_quota_client.h" +#include "webkit/browser/database/database_util.h" +#include "webkit/browser/database/databases_table.h" #include "webkit/quota/quota_manager.h" #include "webkit/quota/special_storage_policy.h" diff --git a/webkit/database/database_tracker.h b/webkit/browser/database/database_tracker.h index d9f1e19..b2f922c 100644 --- a/webkit/database/database_tracker.h +++ b/webkit/browser/database/database_tracker.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_DATABASE_DATABASE_TRACKER_H_ -#define WEBKIT_DATABASE_DATABASE_TRACKER_H_ +#ifndef WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_ +#define WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_ #include <map> #include <set> @@ -19,7 +19,7 @@ #include "base/string_util.h" #include "base/time.h" #include "net/base/completion_callback.h" -#include "webkit/database/database_connections.h" +#include "webkit/common/database/database_connections.h" #include "webkit/storage/webkit_storage_export.h" namespace base { @@ -309,4 +309,4 @@ class WEBKIT_STORAGE_EXPORT DatabaseTracker } // namespace webkit_database -#endif // WEBKIT_DATABASE_DATABASE_TRACKER_H_ +#endif // WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_ diff --git a/webkit/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc index dc89dd8..32bf570 100644 --- a/webkit/database/database_tracker_unittest.cc +++ b/webkit/browser/database/database_tracker_unittest.cc @@ -16,7 +16,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/sqlite/sqlite3.h" #include "webkit/base/origin_url_conversions.h" -#include "webkit/database/database_tracker.h" +#include "webkit/browser/database/database_tracker.h" #include "webkit/quota/mock_special_storage_policy.h" #include "webkit/quota/quota_manager.h" diff --git a/webkit/database/database_util.cc b/webkit/browser/database/database_util.cc index 09778a1..6c98d4e 100644 --- a/webkit/database/database_util.cc +++ b/webkit/browser/database/database_util.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/database/database_util.h" +#include "webkit/browser/database/database_util.h" #include "base/basictypes.h" #include "base/utf_string_conversions.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "webkit/database/database_tracker.h" -#include "webkit/database/vfs_backend.h" +#include "webkit/browser/database/database_tracker.h" +#include "webkit/browser/database/vfs_backend.h" namespace webkit_database { diff --git a/webkit/database/database_util.h b/webkit/browser/database/database_util.h index 6fee84a..547e0a2 100644 --- a/webkit/database/database_util.h +++ b/webkit/browser/database/database_util.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_DATABASE_DATABASE_UTIL_H_ -#define WEBKIT_DATABASE_DATABASE_UTIL_H_ +#ifndef WEBKIT_BROWSER_DATABASE_DATABASE_UTIL_H_ +#define WEBKIT_BROWSER_DATABASE_DATABASE_UTIL_H_ #include "base/string16.h" #include "googleurl/src/gurl.h" @@ -35,4 +35,4 @@ class WEBKIT_STORAGE_EXPORT DatabaseUtil { } // namespace webkit_database -#endif // WEBKIT_DATABASE_DATABASE_UTIL_H_ +#endif // WEBKIT_BROWSER_DATABASE_DATABASE_UTIL_H_ diff --git a/webkit/database/database_util_unittest.cc b/webkit/browser/database/database_util_unittest.cc index 0f6dd84..649b58a 100644 --- a/webkit/database/database_util_unittest.cc +++ b/webkit/browser/database/database_util_unittest.cc @@ -6,7 +6,7 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/base/origin_url_conversions.h" -#include "webkit/database/database_util.h" +#include "webkit/browser/database/database_util.h" using webkit_database::DatabaseUtil; diff --git a/webkit/database/databases_table.cc b/webkit/browser/database/databases_table.cc index fa0c837..45c76ec 100644 --- a/webkit/database/databases_table.cc +++ b/webkit/browser/database/databases_table.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/database/databases_table.h" +#include "webkit/browser/database/databases_table.h" #include "base/logging.h" #include "base/utf_string_conversions.h" diff --git a/webkit/database/databases_table.h b/webkit/browser/database/databases_table.h index 91abad9..6fa4c08 100644 --- a/webkit/database/databases_table.h +++ b/webkit/browser/database/databases_table.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_DATABASE_DATABASES_TABLE_H_ -#define WEBKIT_DATABASE_DATABASES_TABLE_H_ +#ifndef WEBKIT_BROWSER_DATABASE_DATABASES_TABLE_H_ +#define WEBKIT_BROWSER_DATABASE_DATABASES_TABLE_H_ #include <vector> @@ -50,4 +50,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE DatabasesTable { } // namespace webkit_database -#endif // WEBKIT_DATABASE_DATABASES_TABLE_H_ +#endif // WEBKIT_BROWSER_DATABASE_DATABASES_TABLE_H_ diff --git a/webkit/database/databases_table_unittest.cc b/webkit/browser/database/databases_table_unittest.cc index c7f58bd6..30a7975 100644 --- a/webkit/database/databases_table_unittest.cc +++ b/webkit/browser/database/databases_table_unittest.cc @@ -7,7 +7,7 @@ #include "sql/connection.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/database/databases_table.h" +#include "webkit/browser/database/databases_table.h" namespace { diff --git a/webkit/database/vfs_backend.cc b/webkit/browser/database/vfs_backend.cc index c1e2357..041c44b 100644 --- a/webkit/database/vfs_backend.cc +++ b/webkit/browser/database/vfs_backend.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/database/vfs_backend.h" +#include "webkit/browser/database/vfs_backend.h" #include "base/file_util.h" #include "base/files/file_path.h" diff --git a/webkit/database/vfs_backend.h b/webkit/browser/database/vfs_backend.h index 0459958..e5d3374 100644 --- a/webkit/database/vfs_backend.h +++ b/webkit/browser/database/vfs_backend.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_DATABASE_VFS_BACKEND_H_ -#define WEBKIT_DATABASE_VFS_BACKEND_H_ +#ifndef WEBKIT_BROWSER_DATABASE_VFS_BACKEND_H_ +#define WEBKIT_BROWSER_DATABASE_VFS_BACKEND_H_ #include "base/platform_file.h" #include "base/process.h" @@ -41,4 +41,4 @@ class WEBKIT_STORAGE_EXPORT VfsBackend { } // namespace webkit_database -#endif // WEBKIT_DATABASE_VFS_BACKEND_H_ +#endif // WEBKIT_BROWSER_DATABASE_VFS_BACKEND_H_ diff --git a/webkit/browser/database/webkit_browser_database.gypi b/webkit/browser/database/webkit_browser_database.gypi new file mode 100644 index 0000000..0e4e9ad --- /dev/null +++ b/webkit/browser/database/webkit_browser_database.gypi @@ -0,0 +1,20 @@ +# 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_database_sources': [ + '../browser/database/databases_table.cc', + '../browser/database/databases_table.h', + '../browser/database/database_quota_client.cc', + '../browser/database/database_quota_client.h', + '../browser/database/database_tracker.cc', + '../browser/database/database_tracker.h', + '../browser/database/database_util.cc', + '../browser/database/database_util.h', + '../browser/database/vfs_backend.cc', + '../browser/database/vfs_backend.h', + ], + }, +} diff --git a/webkit/browser/webkit_browser.gypi b/webkit/browser/webkit_browser.gypi index 3bd1e90..0e27906 100644 --- a/webkit/browser/webkit_browser.gypi +++ b/webkit/browser/webkit_browser.gypi @@ -4,12 +4,14 @@ { 'includes': [ + '../browser/database/webkit_browser_database.gypi', '../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_database_sources)', '<@(webkit_browser_fileapi_sources)', ], }, diff --git a/webkit/database/database_connections.cc b/webkit/common/database/database_connections.cc index d090350..56db388 100644 --- a/webkit/database/database_connections.cc +++ b/webkit/common/database/database_connections.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/database/database_connections.h" +#include "webkit/common/database/database_connections.h" #include "base/auto_reset.h" #include "base/bind.h" diff --git a/webkit/database/database_connections.h b/webkit/common/database/database_connections.h index f6f0a92..e81c053 100644 --- a/webkit/database/database_connections.h +++ b/webkit/common/database/database_connections.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_DATABASE_DATABASE_CONNECTIONS_H_ -#define WEBKIT_DATABASE_DATABASE_CONNECTIONS_H_ +#ifndef WEBKIT_COMMON_DATABASE_DATABASE_CONNECTIONS_H_ +#define WEBKIT_COMMON_DATABASE_DATABASE_CONNECTIONS_H_ #include <map> #include <vector> @@ -95,4 +95,4 @@ class WEBKIT_STORAGE_EXPORT DatabaseConnectionsWrapper } // namespace webkit_database -#endif // WEBKIT_DATABASE_DATABASE_CONNECTIONS_H_ +#endif // WEBKIT_COMMON_DATABASE_DATABASE_CONNECTIONS_H_ diff --git a/webkit/database/database_connections_unittest.cc b/webkit/common/database/database_connections_unittest.cc index 4a7b841..23d6847 100644 --- a/webkit/database/database_connections_unittest.cc +++ b/webkit/common/database/database_connections_unittest.cc @@ -7,7 +7,7 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/database/database_connections.h" +#include "webkit/common/database/database_connections.h" namespace webkit_database { diff --git a/webkit/common/database/webkit_common_database.gypi b/webkit/common/database/webkit_common_database.gypi new file mode 100644 index 0000000..d1851ed --- /dev/null +++ b/webkit/common/database/webkit_common_database.gypi @@ -0,0 +1,12 @@ +# 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_common_database_sources': [ + '../common/database/database_connections.cc', + '../common/database/database_connections.h', + ], + }, +} diff --git a/webkit/common/webkit_common.gypi b/webkit/common/webkit_common.gypi new file mode 100644 index 0000000..75895e5 --- /dev/null +++ b/webkit/common/webkit_common.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': [ + '../common/database/webkit_common_database.gypi', + ], + # TODO(michaeln): Have webkit_browser target and deprecate old gypis like + # webkit_storage.gypi. + 'variables': { + 'webkit_common_storage_sources': [ + '<@(webkit_common_database_sources)', + ], + }, +} diff --git a/webkit/database/webkit_database.gypi b/webkit/database/webkit_database.gypi deleted file mode 100644 index dde3c09..0000000 --- a/webkit/database/webkit_database.gypi +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2011 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_database_sources': [ - '../database/databases_table.cc', - '../database/databases_table.h', - '../database/database_connections.cc', - '../database/database_connections.h', - '../database/database_quota_client.cc', - '../database/database_quota_client.h', - '../database/database_tracker.cc', - '../database/database_tracker.h', - '../database/database_util.cc', - '../database/database_util.h', - '../database/vfs_backend.cc', - '../database/vfs_backend.h', - ], - }, -} diff --git a/webkit/dom_storage/dom_storage_area.cc b/webkit/dom_storage/dom_storage_area.cc index 5d9e3c6..be35718 100644 --- a/webkit/dom_storage/dom_storage_area.cc +++ b/webkit/dom_storage/dom_storage_area.cc @@ -13,7 +13,7 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/base/origin_url_conversions.h" -#include "webkit/database/database_util.h" +#include "webkit/browser/database/database_util.h" #include "webkit/dom_storage/dom_storage_map.h" #include "webkit/dom_storage/dom_storage_namespace.h" #include "webkit/dom_storage/dom_storage_task_runner.h" diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi index bcc6b97..fa5bfd5 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -6,7 +6,6 @@ 'includes': [ '../appcache/webkit_appcache.gypi', '../blob/webkit_blob.gypi', - '../database/webkit_database.gypi', '../dom_storage/webkit_dom_storage.gypi', '../fileapi/webkit_fileapi.gypi', '../quota/webkit_quota.gypi', @@ -14,6 +13,7 @@ # TODO(kinuko): Deprecate this when we have a new target for # webkit_browser. crbug.com/239710 '../browser/webkit_browser.gypi', + '../common/webkit_common.gypi', ], 'targets': [ { @@ -37,13 +37,13 @@ '../storage/webkit_storage_export.h', '<@(webkit_appcache_sources)', '<@(webkit_blob_sources)', - '<@(webkit_database_sources)', '<@(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)', + '<@(webkit_common_storage_sources)', ], 'conditions': [ ['chromeos==1', { diff --git a/webkit/support/simple_database_system.cc b/webkit/support/simple_database_system.cc index db20ebe..c5f6e11 100644 --- a/webkit/support/simple_database_system.cc +++ b/webkit/support/simple_database_system.cc @@ -16,8 +16,8 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" #include "third_party/sqlite/sqlite3.h" -#include "webkit/database/database_util.h" -#include "webkit/database/vfs_backend.h" +#include "webkit/browser/database/database_util.h" +#include "webkit/browser/database/vfs_backend.h" using webkit_database::DatabaseTracker; using webkit_database::DatabaseUtil; diff --git a/webkit/support/simple_database_system.h b/webkit/support/simple_database_system.h index 000ff9c..0e07e23 100644 --- a/webkit/support/simple_database_system.h +++ b/webkit/support/simple_database_system.h @@ -14,8 +14,8 @@ #include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h" -#include "webkit/database/database_connections.h" -#include "webkit/database/database_tracker.h" +#include "webkit/browser/database/database_tracker.h" +#include "webkit/common/database/database_connections.h" namespace base { class MessageLoopProxy; diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index 05e3e72..aa2d691 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -32,7 +32,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" #include "v8/include/v8.h" #include "webkit/appcache/web_application_cache_host_impl.h" -#include "webkit/database/vfs_backend.h" +#include "webkit/browser/database/vfs_backend.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp index 713c06e..4eed048 100644 --- a/webkit/support/webkit_support.gyp +++ b/webkit/support/webkit_support.gyp @@ -15,7 +15,6 @@ '../../build/win_precompile.gypi', '../appcache/webkit_appcache.gypi', '../base/webkit_base.gypi', - '../database/webkit_database.gypi', '../glue/webkit_glue.gypi', '../media/webkit_media.gypi', '../plugins/webkit_plugins.gypi', diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc index 614dfb9..e17e531 100644 --- a/webkit/tools/test_shell/simple_dom_storage_system.cc +++ b/webkit/tools/test_shell/simple_dom_storage_system.cc @@ -10,7 +10,7 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" -#include "webkit/database/database_util.h" +#include "webkit/browser/database/database_util.h" #include "webkit/dom_storage/dom_storage_area.h" #include "webkit/dom_storage/dom_storage_host.h" |